github/sparrow-kata-full
1
0
Fork 0
mirror of https://github.com/AmbiML/sparrow-kata-full.git synced 2025-08-26 00:39:02 +00:00
Code Issues Projects Releases Wiki Activity

kata-logger: remove <level> from logged message

Browse Source 
Now that logger level is passed with the message it can be added on the
server side if desired. For now just remove it entirely so we have more
space for the actual message.

Change-Id: I7b8dbdb0460cf2bf7b009ddc5d9d70a438f9d803
GitOrigin-RevId: 701ca7a5d32f1ad5c5f583db78b6c5e7625857f4
This commit is contained in:
Sam Leffler 2021-08-11 10:26:05 -07:00
parent 8ace3eb6f2
commit cb99661cd0
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/system/components/DebugConsole/kata-logger/src/lib.rs
View File

@ -20,14 +20,8 @@ impl log::Log for KataLogger {
use bare_io::{Cursor, Write}; use bare_io::{Cursor, Write};
let mut buf = [0 as u8; MAX_MSG_LEN]; let mut buf = [0 as u8; MAX_MSG_LEN];
let mut cur = Cursor::new(&mut buf[..]); let mut cur = Cursor::new(&mut buf[..]);
// Log msgs are of the form: '<'<level>'>' <target>::<fmt'd-msg> // Log msgs are of the form: '<target>::<fmt'd-msg>
write!( write!(&mut cur, "{}::{}\0", record.target(), record.args())
&mut cur,
"<{}> {}::{}\0",
record.level(),
record.target(),
record.args()
)
.unwrap_or_else(|_| { .unwrap_or_else(|_| {
// Too big, indicate overflow with a trailing "...". // Too big, indicate overflow with a trailing "...".
cur.set_position((MAX_MSG_LEN - 4) as u64); cur.set_position((MAX_MSG_LEN - 4) as u64);
@ -42,12 +36,7 @@ impl log::Log for KataLogger {
record: &Record, record: &Record,
) -> &'a cstr_core::CStr { ) -> &'a cstr_core::CStr {
let mut cur = Cursor::new(&mut buf[..]); let mut cur = Cursor::new(&mut buf[..]);
write!( write!(&mut cur, "{}::<embedded nul>\0", record.target())
&mut cur,
"<{}> {}::<embedded nul>\0",
record.level(),
record.target()
)
.expect("nul!"); .expect("nul!");
let pos = cur.position() as usize; let pos = cur.position() as usize;
CStr::from_bytes_with_nul(&buf[..pos]).unwrap() CStr::from_bytes_with_nul(&buf[..pos]).unwrap()
@ -95,10 +84,10 @@ mod tests {
// Formats a log message as done by KataLogger and returns a zero-padded // Formats a log message as done by KataLogger and returns a zero-padded
// Vec holding the message. // Vec holding the message.
fn log_msg(level: log::Level, msg: &str) -> Result<Vec<u8>, std::io::Error> { fn log_msg(_level: log::Level, msg: &str) -> Result<Vec<u8>, std::io::Error> {
let mut v = Vec::new(); let mut v = Vec::new();
use std::io::Write; use std::io::Write;
write!(&mut v, "<{}> {}::{}\0", level, "kata_logger::tests", msg)?; write!(&mut v, "{}::{}\0", "kata_logger::tests", msg)?;
v.resize(MAX_MSG_LEN, 0); v.resize(MAX_MSG_LEN, 0);
assert_eq!(v.len(), MAX_MSG_LEN); assert_eq!(v.len(), MAX_MSG_LEN);
Ok(v) Ok(v)
@ -233,7 +222,7 @@ mod tests {
debug!("{}", debug_msg); debug!("{}", debug_msg);
// Blech, must take into account log msg formatting. // Blech, must take into account log msg formatting.
debug_msg.truncate(MAX_MSG_LEN - 4 - "<DEBUG> kata_logger::tests::".len()); debug_msg.truncate(MAX_MSG_LEN - 4 - "kata_logger::tests::".len());
debug_msg.push_str("..."); debug_msg.push_str("...");
pop_and_check_result(log::Level::Debug, &debug_msg[..]); pop_and_check_result(log::Level::Debug, &debug_msg[..]);
} }