From f3b66541ed332404d17019f525bfb98c2df23fc4 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Fri, 5 Dec 2025 21:56:47 -0700 Subject: [PATCH] simplify log_format code --- signal-gateway/src/log_format.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/signal-gateway/src/log_format.rs b/signal-gateway/src/log_format.rs index 86afa32..acfef7b 100644 --- a/signal-gateway/src/log_format.rs +++ b/signal-gateway/src/log_format.rs @@ -26,13 +26,10 @@ impl LogFormatConfig { /// The `now` parameter is the current time, used to calculate relative /// timestamps (e.g., "T-10s"). pub fn write_log_msg(&self, mut writer: impl std::fmt::Write, log_msg: &LogMessage, now: DateTime) { - let sev = log_msg.level.to_str(); - let msg = &log_msg.msg; - // Format: "ERROR T-10s [foo bar.rs:42]: message" // Pad severity to 5 chars (left-aligned), time to 8 chars (right-aligned) - if self.write_log_msg_inner(&mut writer, log_msg, now, sev, msg).is_err() { - error!("Couldn't write log message: {sev}: {msg}"); + if self.write_log_msg_inner(&mut writer, log_msg, now).is_err() { + error!("Couldn't write log message: {}: {}", log_msg.level.to_str(), log_msg.msg); } } @@ -41,11 +38,9 @@ impl LogFormatConfig { writer: &mut impl std::fmt::Write, log_msg: &LogMessage, now: DateTime, - sev: &str, - msg: &str, ) -> std::fmt::Result { // Write severity (5 chars left-aligned) - write!(writer, "{:<5} ", sev)?; + write!(writer, "{:<5} ", log_msg.level.to_str())?; // Write timestamp (8 chars right-aligned) let ts = log_msg @@ -91,7 +86,7 @@ impl LogFormatConfig { write!(writer, "]")?; } - writeln!(writer, ": {msg}") + writeln!(writer, ": {}", log_msg.msg) } }