From: Michael Tremer Date: Thu, 4 May 2023 14:53:34 +0000 (+0000) Subject: logstreams: Ensure that clients leave correctly X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0982b61d1291b5d58948a5dcb3e1affd20306d41;p=pbs.git logstreams: Ensure that clients leave correctly on_close() is not a coroutine. Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/logstreams.py b/src/buildservice/logstreams.py index b8be6cd9..0f89c6a7 100644 --- a/src/buildservice/logstreams.py +++ b/src/buildservice/logstreams.py @@ -110,7 +110,7 @@ class LogStream(base.Object): log.debug("%s has joined the stream for %s" % (consumer, self.job)) - async def leave(self, consumer): + def leave(self, consumer): """ Called when a consumer wants to leave the stream """ diff --git a/src/web/jobs.py b/src/web/jobs.py index 19eecf21..fae68cbf 100644 --- a/src/web/jobs.py +++ b/src/web/jobs.py @@ -118,11 +118,11 @@ class APIv1LogStreamHandler(base.BackendMixin, tornado.websocket.WebSocketHandle # Send messages without any delay self.set_nodelay(True) - async def on_close(self): + def on_close(self): """ Leave the stream """ - await self.stream.leave(self) + self.stream.leave(self) async def message(self, message): """