check all configs for mqtt and address stuff; adding pioreactor-web.target status and restart to leadeR

Author: CamDavidsonPilon

core/pioreactor/web/api.py

@@ -2365,10 +2365,10 @@ def update_config(filename: str) -> ResponseReturnValue:
             assert config.get("cluster.topology", "leader_address")
             assert config["mqtt"]
 
-            if config.get("cluster.topology", "leader_address").startswith("http") or config.get(
-                "mqtt", "broker_address"
-            ).startswith("http"):
-                raise ValueError("Don't start addresses with http:// or https://")
+        if config.get("cluster.topology", "leader_address", fallback="").startswith("http") or config.get(
+            "mqtt", "broker_address", fallback=""
+        ).startswith("http"):
+            abort_with(400, "Don't start addresses with http:// or https://")
 
     except configparser.DuplicateSectionError as e:
         msg = f"Duplicate section [{e.section}] was found. Please fix and try again."

core/pioreactor/web/tasks.py

@@ -848,6 +848,15 @@ def reboot(wait=0) -> bool:
     return result.returncode == 0
 
 
+@huey.task()
+def restart_pioreactor_web_target() -> bool:
+    logger.debug("Restarting pioreactor-web.target")
+    if whoami.is_testing_env():
+        return True
+    result = run(["sudo", "systemctl", "restart", "pioreactor-web.target"])
+    return result.returncode == 0
+
+
 @huey.task()
 def pios(*args: str, env: dict[str, str] | None = None) -> bool:
     env = filter_to_allowed_env(env or {})

core/pioreactor/web/unit_api.py

@@ -2,8 +2,10 @@
 import json
 import os
 import zipfile
+from functools import wraps
 from io import BytesIO
 from pathlib import Path
+from subprocess import run
 from tempfile import NamedTemporaryFile
 from time import sleep
 from typing import Any
@@ -142,6 +144,16 @@ def _build_calibration_protocol_payloads() -> list[dict[str, Any]]:
     return sorted(protocols, key=lambda item: (item["target_device"], item["title"]))
 
 
+def require_leader(view_func):
+    @wraps(view_func)
+    def _wrapped(*args, **kwargs):
+        if HOSTNAME != get_leader_hostname():
+            abort_with(403, "This endpoint is only available on the leader.")
+        return view_func(*args, **kwargs)
+
+    return _wrapped
+
+
 ### SYSTEM
 
 
@@ -201,6 +213,49 @@ def shutdown() -> DelayedResponseReturnValue:
     return create_task_response(task)
 
 
+@unit_api_bp.route("/system/web_server/status", methods=["GET"])
+@require_leader
+def get_web_server_status() -> ResponseReturnValue:
+    if whoami.is_testing_env():
+        status_text = "active"
+        return attach_cache_control(
+            jsonify(
+                {
+                    "service": "pioreactor-web.target",
+                    "state": "ready",
+                    "raw_status": status_text,
+                }
+            ),
+            max_age=0,
+        )
+
+    result = run(
+        ["systemctl", "is-active", "pioreactor-web.target"],
+        capture_output=True,
+        text=True,
+    )
+    status_text = (result.stdout or result.stderr).strip()
+    is_active = result.returncode == 0 and status_text == "active"
+    state = "ready" if is_active else "disconnected"
+    return attach_cache_control(
+        jsonify(
+            {
+                "service": "pioreactor-web.target",
+                "state": state,
+                "raw_status": status_text,
+            }
+        ),
+        max_age=3,
+    )
+
+
+@unit_api_bp.route("/system/web_server/restart", methods=["POST", "PATCH"])
+@require_leader
+def restart_web_server() -> DelayedResponseReturnValue:
+    task = tasks.restart_pioreactor_web_target()
+    return create_task_response(task)
+
+
 @unit_api_bp.route("/system/remove_file", methods=["POST", "PATCH"])
 def remove_file() -> DelayedResponseReturnValue:
     task_name = "remove_file"

frontend/src/Leader.jsx

@@ -592,8 +592,10 @@ function LeaderCard({leaderHostname}) {
 
 function LeaderJobs(){
 
+  const webServerJobName = "web server"
   const [mqtt_to_db_streaming_state, set_mqtt_to_db_streaming_state] = React.useState("disconnected")
   const [monitor_state, set_monitor_state] = React.useState("disconnected")
+  const [webServerState, setWebServerState] = React.useState("disconnected")
   const [otherLongRunningJobs, setOtherLongRunningJobs] = React.useState([])
   const [restartingJob, setRestartingJob] = React.useState(null)
 
@@ -618,45 +620,93 @@ function LeaderJobs(){
     }
   }
 
+  async function restartWebServer() {
+    setRestartingJob(webServerJobName);
+    try {
+      const response = await fetch("/unit_api/system/web_server/restart", {
+        method: "POST",
+      });
+      if (!response.ok) {
+        throw new Error(`Failed to restart web server: ${response.statusText}`);
+      }
+    } catch (error) {
+      console.error("Error restarting web server:", error);
+    } finally {
+      setRestartingJob(null);
+    }
+  }
+
   React.useEffect(() => {
     let ignore = false;
-    fetch("/unit_api/long_running_jobs/running")
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error(`Failed to fetch long-running jobs: ${response.statusText}`);
-        }
-        return response.json();
-      })
-      .then((data) => {
-        if (ignore) {
-          return;
+    const fetchJobs = async () => {
+      try {
+        const [jobsResult, webResult] = await Promise.allSettled([
+          fetch("/unit_api/long_running_jobs/running"),
+          fetch("/unit_api/system/web_server/status"),
+        ]);
+
+        if (jobsResult.status === "fulfilled") {
+          const response = jobsResult.value;
+          if (!response.ok) {
+            throw new Error(`Failed to fetch long-running jobs: ${response.statusText}`);
+          }
+          const data = await response.json();
+
+          if (!ignore) {
+            let mqttState = "disconnected";
+            let monitorState = "disconnected";
+            const remainingJobs = [];
+
+            data.forEach((job) => {
+              switch (job.job_name) {
+                case "mqtt_to_db_streaming":
+                  mqttState = "ready";
+                  break;
+                case "monitor":
+                  monitorState = "ready";
+                  break;
+                default:
+                  remainingJobs.push({ job_name: job.job_name, state: "ready" });
+                  break;
+              }
+            });
+
+            set_mqtt_to_db_streaming_state(mqttState);
+            set_monitor_state(monitorState);
+            setOtherLongRunningJobs(remainingJobs);
+          }
+        } else {
+          console.error("Error fetching long-running jobs:", jobsResult.reason);
         }
 
-        let mqttState = "disconnected";
-        let monitorState = "disconnected";
-        const remainingJobs = [];
-
-        data.forEach((job) => {
-          switch (job.job_name) {
-            case "mqtt_to_db_streaming":
-              mqttState = "ready";
-              break;
-            case "monitor":
-              monitorState = "ready";
-              break;
-            default:
-              remainingJobs.push({ job_name: job.job_name, state: "ready" });
-              break;
+        if (webResult.status === "fulfilled") {
+          const response = webResult.value;
+          if (response.ok) {
+            const webData = await response.json();
+            if (!ignore) {
+              setWebServerState(webData?.state || "disconnected");
+            }
+          } else {
+            console.error("Failed to fetch web server status:", response.statusText);
+            if (!ignore) {
+              setWebServerState("disconnected");
+            }
           }
-        });
-
-        set_mqtt_to_db_streaming_state(mqttState);
-        set_monitor_state(monitorState);
-        setOtherLongRunningJobs(remainingJobs);
-      })
-      .catch((error) => {
+        } else {
+          console.error("Error fetching web server status:", webResult.reason);
+          if (!ignore) {
+            setWebServerState("disconnected");
+          }
+        }
+      } catch (error) {
         console.error("Error fetching long-running jobs:", error);
-      });
+        if (!ignore) {
+          setWebServerState("disconnected");
+        }
+      }
+    };
+
+    fetchJobs();
   return () => {
     ignore = true;
   };
@@ -678,6 +728,17 @@ function LeaderJobs(){
               </TableRow>
             </TableHead>
             <TableBody>
+              <TableRow>
+                <TableCell sx={{padding: "6px 0px"}}>{webServerJobName}</TableCell>
+                <TableCell align="right"><StateTypography state={webServerState}/></TableCell>
+                <TableCell align="right" sx={{padding: "6px 0px"}}>
+                  <RestartJobButton
+                    jobName={webServerJobName}
+                    onRestart={restartWebServer}
+                    isRestarting={restartingJob === webServerJobName}
+                  />
+                </TableCell>
+              </TableRow>
               <TableRow>
                 <TableCell sx={{padding: "6px 0px"}}>mqtt_to_db_streaming</TableCell>
                 <TableCell align="right"><StateTypography state={mqtt_to_db_streaming_state}/></TableCell>

frontend/src/Pioreactor.jsx

@@ -825,7 +825,7 @@ function SettingsActionsDialog(props) {
                       size="small"
                       variant="outlined"
                       label="XR"
-                      sx={{ ml: 0.5, height: 18, fontSize: "0.65rem", "& .MuiChip-label": { px: "5px" } }}
+                      sx={{ ml: 0.5, height: 18, fontSize: "0.65rem", "& .MuiChip-label": { px: "5px", pt: "1px" } }}
                     />
                   ) : null}
                 </Typography>

frontend/src/Pioreactors.jsx

@@ -2627,7 +2627,7 @@ function PioreactorCard({unit, isUnitActive, experiment, config, originalLabel,
                     size="small"
                     variant="outlined"
                     label="XR"
-                    sx={{ ml: 0.5, height: 18, fontSize: "0.65rem", "& .MuiChip-label": { px: "5px" } }}
+                    sx={{ ml: 0.5, height: 18, fontSize: "0.65rem", "& .MuiChip-label": { px: "5px", pt: "1px" } }}
                   />
                 ) : null}
               </Typography>