Merge pull request #16 from abel-von/kuasar

shim: add missing branch to break the loop of waitpid
kuasar-io · Jan 2, 2024 · 57a1d4b · 57a1d4b
2 parents db28688 + 6d0cf3e
commit 57a1d4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/shim/src/asynchronous/mod.rs b/crates/shim/src/asynchronous/mod.rs
@@ -386,7 +386,7 @@ async fn handle_signals(signals: Signals) {
                             .await
                             .unwrap_or_else(|e| error!("failed to send signal event {}", e))
                     }
-                    Err(Error::Nix(Errno::ECHILD)) => {
+                    Err(Error::Nix(Errno::ECHILD)) | Ok(WaitStatus::StillAlive)=> {
                         break;
                     }
                     Err(e) => {

diff --git a/crates/shim/src/synchronous/mod.rs b/crates/shim/src/synchronous/mod.rs
@@ -254,7 +254,7 @@ fn handle_signals(mut signals: Signals) {
                             monitor::monitor_notify_by_pid(pid.as_raw(), exit_code)
                                 .unwrap_or_else(|e| error!("failed to send signal event {}", e))
                         }
-                        Err(Errno::ECHILD) => {
+                        Err(Errno::ECHILD) | Ok(WaitStatus::StillAlive) => {
                             break;
                         }
                         Err(e) => {