From f5f4750471ddde86fca68dea87d1c8377c5a2d55 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 14 Dec 2023 18:11:00 +0200 Subject: [PATCH] feat: format log file to be more markdown Signed-off-by: Lars Wirzenius --- src/main.rs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index f03d6a1..f8ddc4f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -114,13 +114,13 @@ fn run( .map_err(|e| NativeError::CreateLog(log_filename.into(), e))?, ); - logmsg(log_filename, &mut log, "=== Radicle native CI\n".into())?; + logmsg(log_filename, &mut log, "# Radicle native CI\n".into())?; logmsg( log_filename, &mut log, - format!("=== Repository id: {}\n", repo), + format!("# Repository id: {}\n", repo), )?; - logmsg(log_filename, &mut log, format!("=== Commit: {}\n", commit))?; + logmsg(log_filename, &mut log, format!("# Commit: {}\n", commit))?; write_response(&Response::triggered(RunId::from( run_id.to_string().as_str(), @@ -166,7 +166,6 @@ fn runcmd( argv: &[&str], cwd: &Path, ) -> Result<(), NativeError> { - logmsg(log_filename, log, format!("=== Run: {:?}\n---\n", argv))?; let mut p = Popen::create( argv, PopenConfig { @@ -177,13 +176,26 @@ fn runcmd( }, ) .map_err(|e| NativeError::PopenCreate(format!("{:?}", argv), e))?; + logmsg( + log_filename, + log, + format!( + "# Run command\n\nCommand:\n~~~\n{:?}\n~~~\n\nOutput:\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n", + argv + ), + )?; p.communicate(None) .map_err(|e| NativeError::ChildComms(format!("{:?}", argv), e))?; let exit = p .wait() .map_err(|e| NativeError::PopenFailed(format!("{:?}", argv), e))?; debug!("exit: {:?}", exit); - logmsg(log_filename, log, "...\n".into())?; + logmsg( + log_filename, + log, + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n\n\n".into(), + )?; + if !exit.success() { let error = Response::error(&format!("command failed: {:?}", argv)); error