hub: Update message format for job messages

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

diff --git a/src/pakfire/hub.py b/src/pakfire/hub.py
index 615e1d231396dd95e774650a1ff21648220000ce..f20c3fd4b3c99ec071ea453b3473f8effe0bee64 100644 (file)
--- a/src/pakfire/hub.py
+++ b/src/pakfire/hub.py
@@ -624,15 +624,6 @@ class JobControlConnection(HubObject):
        def url(self):
                return "/api/v1/jobs/%s" % self.id
 
-       async def status(self, status):
-               """
-                       Sends a new status to the hub
-               """
-               await self.write_message({
-                       "message" : "status",
-                       "status"  : status,
-               })
-
        async def finished(self, success, packages=None, logfile=None):
                """
                        Will tell the hub that a job has finished
@@ -647,10 +638,12 @@ class JobControlConnection(HubObject):
 
                # Send the request
                await self.write_message({
-                       "message"  : "finished",
-                       "success"  : success,
-                       "logfile"  : logfile,
-                       "packages" : packages,
+                       "type" : "finished",
+                       "data" : {
+                               "success"  : success,
+                               "logfile"  : logfile,
+                               "packages" : packages,
+                       },
                })
 
                # Handle the response
@@ -661,8 +654,10 @@ class JobControlConnection(HubObject):
                        Sends a log message to the hub
                """
                await self.write_message({
-                       "message"   : "log",
-                       "timestamp" : timestamp,
-                       "level"     : level,
-                       "log"       : message,
+                       "type" : "log",
+                       "data" : {
+                               "timestamp" : timestamp,
+                               "level"     : level,
+                               "log"       : message,
+                       },
                })