jobs: Correctly close any log streams

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/logstreams.py b/src/buildservice/logstreams.py
index 6eb5d28951d3fabd02bbd65ff0a917c2ddeec2c6..686462ad60e9184abfa358c60d21219e921a5abf 100644 (file)
--- a/src/buildservice/logstreams.py
+++ b/src/buildservice/logstreams.py
@@ -86,7 +86,7 @@ class LogStream(base.Object):
        def __repr__(self):
                return "<%s %s>" % (self.__class__.__name__, self.job)
 
-       async def close(self):
+       def close(self):
                """
                        Called to close all connections to consumers
                """
@@ -94,10 +94,8 @@ class LogStream(base.Object):
                self.backend.logstreams._close(self)
 
                # Close all connections to consumers
-               if self.consumers:
-                       asyncio.gather(
-                               *(c.close() for c in self.consumers)
-                       )
+               for consumer in self.consumers:
+                       consumer.close()
 
        async def join(self, consumer):
                """

diff --git a/src/web/jobs.py b/src/web/jobs.py
index 1a37b6595f180a5c219f0a602858f18a779f485d..86cb273b774267765c4e2bd6d88aa8774c13cef3 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -35,9 +35,9 @@ class APIv1DetailHandler(base.APIMixin, tornado.websocket.WebSocketHandler):
                # Open a new log stream
                self.logstream = self.backend.logstreams.open(self.job)
 
-       async def on_close(self):
+       def on_close(self):
                # Close the logstream
-               await self.logstream.close()
+               self.logstream.close()
 
        async def on_message(self, message):
                message = self._decode_json_message(message)