cleanup

Author: JasonGrace2282

manager/director/apps/sites/consumers.py

@@ -33,15 +33,23 @@ async def connect(self):
             return
         async with self.close_on_error():
             site_id = int(self.scope["url_route"]["kwargs"]["site_id"])
-            site = await find_site(site_id, user)
+            self.site: Site = await find_site(site_id, user)
 
         # Listen for events for this site
         await self.channel_layer.group_add(
-            site.channels_group_name(),
+            self.site.channels_group_name(),
             self.channel_name,
         )
 
         await self.accept()
+        await self.send_site_info(self.site)
+
+    async def operation_updated(self, event: dict[str, Any]) -> None:
+        """Handle an operation update event."""
+        await self.send_site_info(self.site)
+
+    async def send_site_info(self, site: Site) -> None:
+        """Send the site information to the client."""
         info = await self.gather_site_info(site)
         await self.send(text_data=f"<code id='site-info'>\n{json.dumps(info, indent=4)}</code>")
 
@@ -74,21 +82,18 @@ def gather_site_info(self, site: Site) -> dict[str, Any]:
                 "actions": [],
             }
             for action in op.list_actions_in_order():
-                operation_info["actions"].append(
-                    {
-                        "slug": action.slug,
-                        "name": action.name,
-                        "started_time": (
-                            action.started_time.isoformat()
-                            if action.started_time is not None
-                            else None
-                        ),
-                        "result": action.result,
-                        "user_message": action.user_message,
-                    }
-                )
+                action_info = {
+                    "slug": action.slug,
+                    "name": action.name,
+                    "started_time": (
+                        action.started_time.isoformat() if action.started_time is not None else None
+                    ),
+                    "result": action.result,
+                    "user_message": action.user_message,
+                }
                 if self.scope["user"].is_superuser:
-                    operation_info["actions"][-1]["message"] = action.message
+                    action_info["message"] = action.message
+                operation_info["actions"].append(action_info)
 
             info["operation"] = operation_info
 

manager/director/apps/sites/operations.py

@@ -181,6 +181,7 @@ async def send_operation_updated_message(site: Site) -> None:
     """Broadcast that the operation status has been updated."""
     await get_channel_layer().group_send(
         site.channels_group_name(),
+        # dispatch to the consumer's `operation_updated` method
         {"type": "operation.updated"},
     )
 
@@ -190,5 +191,6 @@ async def send_site_updated_message(site: Site) -> None:
     """Broadcast that the site metadata has been updated."""
     await get_channel_layer().group_send(
         site.channels_group_name(),
+        # dispatch to the consumer's `site_updated` method
         {"type": "site.updated"},
     )

manager/director/apps/sites/tasks.py

@@ -17,6 +17,12 @@ def create_site(operation_id: int) -> None:
         wrapper.register_action("Creating Docker service", actions.update_docker_service)
 
 
+@shared_task
+def restart_site_process(operation_id: int) -> None:
+    with auto_run_operation_wrapper(operation_id) as wrapper:
+        wrapper.register_action("Restarting Docker service", actions.update_docker_service)
+
+
 @shared_task
 def delete_site(operation_id: int) -> None:
     site = Site.objects.get(operation__id=operation_id)