From 122179414cec30934a1e3c35f11fc006b0ee7153 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 26 Oct 2023 18:00:44 +0200 Subject: [PATCH] system report: record stderr output too Signed-off-by: Thomas Lamprecht --- src/server/report.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/server/report.rs b/src/server/report.rs index 2a2317a3..703daa71 100644 --- a/src/server/report.rs +++ b/src/server/report.rs @@ -154,10 +154,20 @@ fn get_command_output(exe: &str, args: &Vec<&str>) -> String { .args(args) .output(); let output = match output { - Ok(output) => String::from_utf8_lossy(&output.stdout).to_string(), + Ok(output) => { + let mut out = String::from_utf8_lossy(&output.stdout) + .trim_end() + .to_string(); + let stderr = String::from_utf8_lossy(&output.stderr) + .trim_end() + .to_string(); + if !stderr.is_empty() { + writeln!(out, "\n```\nSTDERR:\n```\n{stderr}"); + } + out + } Err(err) => err.to_string(), }; - let output = output.trim_end(); format!("$ `{exe} {}`\n```\n{output}\n```", args.join(" ")) }