Fix READY status reporting

Author: andyhd

controlpanel/frontend/consumers.py

@@ -122,10 +122,7 @@ def tool_deploy(self, message):
             log.error(err)
             return
 
-        wait_for_deployment(user, tool, deployment)
-
-        status = deployment.status
-        update_tool_status(user, tool, status)
+        status = wait_for_deployment(user, tool, deployment)
 
         if status == TOOL_DEPLOY_FAILED:
             log.error(f"Failed deploying {tool.name} for {user}")
@@ -144,18 +141,14 @@ def tool_restart(self, message):
         deployment = ToolDeployment(tool, user)
         deployment.restart()
 
-        wait_for_deployment(user, tool, deployment)
-
-        status = deployment.status
-        update_tool_status(user, tool, status)
+        status = wait_for_deployment(user, tool, deployment)
 
         if status == TOOL_DEPLOY_FAILED:
             log.error(f"Failed restarting {tool.name} for {user}")
         else:
             log.debug(f"Restarted {tool.name} for {user}")
 
 
-
 def send_sse(user_id, event):
     """
     Tell the SSEConsumer to send an event to the specified user
@@ -193,8 +186,8 @@ def start_background_task(task, message):
 def wait_for_deployment(user, tool, deployment):
     while True:
         status = deployment.status
-        if status in (TOOL_DEPLOY_FAILED, TOOL_READY):
-            break
         update_tool_status(user, tool, status)
+        if status in (TOOL_DEPLOY_FAILED, TOOL_READY):
+            return status
         sleep(1)