From fe16a923190243dfde5db6ceff2ef0bcf9158926 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Tue, 1 Oct 2024 13:15:24 -0500 Subject: feat: simplify service status type --- src/service/systemd.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/service/systemd.rs') diff --git a/src/service/systemd.rs b/src/service/systemd.rs index 90213a0..ee220b8 100644 --- a/src/service/systemd.rs +++ b/src/service/systemd.rs @@ -21,17 +21,14 @@ impl ServiceSpawner for Systemd { loop { interval.tick().await; - let status = match command.output() { - Ok(output) if output.status.success() => Status::Pass, - Ok(output) => { - let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string(); - Status::Fail(Some(format!("Service state: {}", stdout))) + let status = command.output().map_or_else(Into::into, |o| { + if o.status.success() { + Status::Ok + } else { + let stdout = String::from_utf8_lossy(&o.stdout).trim().to_string(); + Status::Error(Some(format!("Service state: {}", stdout))) } - Err(err) => { - tracing::error!("Failed to spawn process: {err}"); - Status::Unknown - } - }; + }); tx.send_if_modified(|s| s.update(status)); } -- cgit v1.2.3-70-g09d2