From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Apr 2023 15:09:36 +0000 (+0000)
Subject: logstreams: Send timestamp
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c8d51daffbb25e219ad6295f78f0ce7b490bede;p=pbs.git

logstreams: Send timestamp

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

diff --git a/src/buildservice/logstreams.py b/src/buildservice/logstreams.py
index 686462ad..94be90f5 100644
--- a/src/buildservice/logstreams.py
+++ b/src/buildservice/logstreams.py
@@ -121,7 +121,7 @@ class LogStream(base.Object):
 
 		log.debug("%s has left the stream for %s" % (consumer, self.job))
 
-	async def message(self, level, message):
+	async def message(self, timestamp, level, message):
 		# Translate the level
 		try:
 			level = self.levels[level]
@@ -132,8 +132,9 @@ class LogStream(base.Object):
 		for line in message.splitlines():
 			# Form a message object that we will send to the consumers
 			m = {
-				"level"   : level,
-				"message" : line,
+				"timestamp" : timestamp,
+				"level"     : level,
+				"message"   : line,
 			}
 
 			# Append the message to the buffer
diff --git a/src/web/jobs.py b/src/web/jobs.py
index 8129f826..0c91572c 100644
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -52,6 +52,7 @@ class APIv1DetailHandler(base.APIMixin, tornado.websocket.WebSocketHandler):
 		# Handle log messages
 		elif t == "log":
 			await self.logstream.message(
+				timestamp=message.get("timestamp"),
 				level=message.get("level"),
 				message=message.get("log"),
 			)