Remove setsid and timeout from child processes

Author: barthalion

Cargo.lock

@@ -38,7 +38,6 @@ filetime = "0.2"
 flat-manager-common = { path = "common" }
 hex = "0.4"
 jwt = { package = "jsonwebtoken", version = "10.3.0", features = ["aws_lc_rs"] }
-libc = "0.2"
 log = "0.4"
 libostree = { package = "ostree", version = "0.20.5", features = ["v2021_5"] }
 r2d2 = "0.8"

Cargo.toml

@@ -14,7 +14,6 @@ mod update_repo_job;
 pub use check_job::update_build_status_after_check;
 pub use job_executor::start_job_executor;
 pub use job_queue::{cleanup_started_jobs, JobQueue, ProcessJobs, StopJobQueue};
-pub(crate) use utils::SetsidCommandExt;
 
 /**************************************************************************
  * Job handling - theory of operations.

src/jobs/mod.rs

@@ -3,7 +3,6 @@ use diesel::prelude::*;
 use diesel::result::Error as DieselError;
 use log::{error, info};
 use std::fmt::Write as _;
-use std::os::unix::process::CommandExt as _;
 use std::process::{Command, Output, Stdio};
 use std::str;
 
@@ -14,34 +13,6 @@ use crate::schema::*;
 
 use super::job_queue::queue_update_job;
 
-pub trait SetsidCommandExt {
-    fn setsid(&mut self) -> &mut Self;
-}
-
-impl SetsidCommandExt for Command {
-    fn setsid(&mut self) -> &mut Self {
-        unsafe {
-            self.pre_exec(|| {
-                libc::setsid();
-                Ok(())
-            });
-        }
-        self
-    }
-}
-
-impl SetsidCommandExt for tokio::process::Command {
-    fn setsid(&mut self) -> &mut Self {
-        unsafe {
-            self.pre_exec(|| {
-                libc::setsid();
-                Ok(())
-            });
-        }
-        self
-    }
-}
-
 pub fn generate_flatpakref(
     ref_name: &str,
     maybe_build_id: Option<i32>,
@@ -161,7 +132,7 @@ macro_rules! job_log_and_error {
 /// Executes a command and returns its output. A JobError is returned if the command couldn't be executed, but not if
 /// it exits with a status code.
 pub fn do_command_with_output(cmd: &mut Command) -> JobResult<Output> {
-    let output = SetsidCommandExt::setsid(cmd)
+    let output = cmd
         .stdin(Stdio::null())
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())

src/jobs/utils.rs

@@ -3,11 +3,8 @@ pub use flat_manager_common::ostree::*;
 use std::path::Path;
 use tokio::process::Command;
 
-use crate::jobs::SetsidCommandExt;
 pub async fn generate_delta_async(repo_path: &Path, delta: &Delta) -> Result<(), OstreeError> {
-    let mut cmd = Command::new("timeout");
-    cmd.arg("3600").arg("flatpak");
-    SetsidCommandExt::setsid(&mut cmd);
+    let mut cmd = Command::new("flatpak");
 
     cmd.arg("build-update-repo")
         .arg("--generate-static-delta-to")