From c21e39c11455cc258c59296472610e17e9efefa9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 26 Apr 2023 15:17:00 +0000 Subject: [PATCH] hub: Update message format for job messages Signed-off-by: Michael Tremer --- src/pakfire/hub.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/pakfire/hub.py b/src/pakfire/hub.py index 615e1d231..f20c3fd4b 100644 --- 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, + }, }) -- 2.39.5