Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve invoke error reporting

Browse Source
This commit is contained in:
Aiden McClelland
2023-06-15 22:26:53 -06:00
committed by Aiden McClelland
parent cb4e12a68c
commit a2cf4001af
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/util/mod.rs
View File

@@ -58,7 +58,12 @@ impl Invoke for tokio::process::Command {
res.status.success(),
error_kind,
"{}",
std::str::from_utf8(&res.stderr).unwrap_or("Unknown Error")
Some(&res.stderr)
.filter(|a| !a.is_empty())
.or(Some(&res.stdout))
.filter(|a| !a.is_empty())
.and_then(|a| std::str::from_utf8(a).ok())
.unwrap_or(&format!("Unknown Error ({})", res.status))
);
Ok(res.stdout)
}