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 686462ad60e9184abfa358c60d21219e921a5abf..94be90f50ad8259989c5ac137663f7145032c540 100644 (file)
--- 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 8129f826d9cc0ac37791333c6e500ea861ae94d7..0c91572c62617680f95f24add04f86910c6e6781 100644 (file)
--- 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"),
                        )