fix(procmgr): align manager reload path after stack rebase onto main

Author: jose-manuel-almaza

Cargo.lock

@@ -69,6 +69,7 @@ nix = { workspace = true, features = ["signal", "process", "user"] }
 
 [dev-dependencies]
 tempfile.workspace = true
+hyper-util = { workspace = true, features = ["tokio"] }
 
 [[test]]
 name = "e2e"

pkg/procmgr/rust/Cargo.toml

@@ -83,11 +83,14 @@ impl ProcessManager {
         let mut procs = self.processes.write().await;
         for &idx in order.iter() {
             let proc = &mut procs[idx];
-            if proc.may_auto_start()
-                && let Err(e) = try_spawn_and_watch(proc, exit_tx)
-            {
-                warn!("{e:#}");
-                queue_restart(proc, restart_tx);
+            if proc.may_auto_start() {
+                match proc.spawn() {
+                    Ok(()) => spawn_watcher(proc, exit_tx.clone()),
+                    Err(e) => {
+                        warn!("{e:#}");
+                        queue_restart(proc, restart_tx);
+                    }
+                }
             }
             proc.record_config_gate_met();
         }
@@ -906,7 +909,10 @@ fn queue_restart(proc: &mut ManagedProcess, restart_tx: &mpsc::Sender<PendingRes
     }
 }
 
-fn try_spawn_and_watch(proc: &mut ManagedProcess, exit_tx: &mpsc::Sender<ExitEvent>) -> Result<()> {
+fn try_spawn_and_watch(
+    proc: &mut ManagedProcess,
+    exit_tx: &mpsc::Sender<ExitEvent>,
+) -> Result<()> {
     proc.spawn()?;
     spawn_watcher(proc, exit_tx.clone());
     Ok(())
@@ -1147,16 +1153,14 @@ mod tests {
             "reload should start the process with fresh counters"
         );
 
-        mgr.complete_restart(stale_pending, &exit_tx, &restart_tx)
-            .await;
+        mgr.complete_restart(stale_pending, &exit_tx, &restart_tx).await;
         let pid = mgr.processes().await[0].pid().unwrap();
         test_helpers::cleanup_process(pid);
         Ok(())
     }
 
     #[tokio::test]
-    async fn test_reload_discards_pending_retry_for_failed_auto_start_false() -> anyhow::Result<()>
-    {
+    async fn test_reload_discards_pending_retry_for_failed_auto_start_false() -> anyhow::Result<()> {
         let (cmd, _args) = test_helpers::sleep_cmd(60);
         let make_def = |secs: u32| ProcessDefinition {
             name: "action-executor".to_string(),
@@ -1203,8 +1207,7 @@ mod tests {
         mgr.handle_reload_config(&exit_tx, &restart_tx).await?;
         assert!(!mgr.processes().await[0].is_running());
 
-        mgr.complete_restart(stale_pending, &exit_tx, &restart_tx)
-            .await;
+        mgr.complete_restart(stale_pending, &exit_tx, &restart_tx).await;
         assert!(
             !mgr.processes().await[0].is_running(),
             "config reload should discard pending crash retries for failed auto_start=false processes"