From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Apr 2023 14:26:52 +0000 (+0000)
Subject: jobs: Correctly close any log streams
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71561b0a66884357f3a2d9fbce58f36d903656bb;p=pbs.git

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 6eb5d289..686462ad 100644
--- 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 1a37b659..86cb273b 100644
--- 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)