Improving child error handling

jzbor · Jul 8, 2024 · 9d82963 · 9d82963
1 parent 7ca8016
commit 9d82963
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -12,8 +12,11 @@ pub enum ZinnError {
     #[error("{0}")]
     Yaml(#[from] serde_yaml::Error),
 
-    #[error("Child exited unsuccessfully")]
-    Child(),
+    #[error("Child exited with error {0}")]
+    ChildFailed(i32),
+
+    #[error("Child terminated by signal")]
+    ChildSignaled(),
 
     #[error("Dependency not found ({0})")]
     DependencyNotFound(String),

diff --git a/src/job.rs b/src/job.rs
@@ -218,10 +218,10 @@ impl InnerJobRealization {
         }
 
         let (io_reader, io_writer) = os_pipe::pipe()?;
-
+        let cmd_with_exit_setting = format!("set -e; {}", self.run);
         let mut process = Command::new("sh")
             .arg("-c")
-            .arg(&self.run)
+            .arg(cmd_with_exit_setting)
             .stdout(io_writer.try_clone()?)
             .stderr(io_writer)
             .spawn()?;
@@ -252,7 +252,10 @@ impl InnerJobRealization {
         }
 
         if !status.success() {
-            Err(ZinnError::Child())
+            match status.code() {
+                Some(code) => Err(ZinnError::ChildFailed(code)),
+                None => Err(ZinnError::ChildSignaled()),
+            }
         } else {
             Ok(JobState::Finished)
         }