Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 21:06:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Log the thread as well

Browse Source
This commit is contained in:
Floris Bruynooghe
2019-11-23 16:26:19 +01:00
parent 780cd9d864
commit 98f55bd8f5
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/log.rs
View File

@@ -124,7 +124,15 @@ impl Logger {
self.file_handle = handle; self.file_handle = handle;
Self::prune(&self.logdir, self.max_files)?; Self::prune(&self.logdir, self.max_files)?;
} }
let msg = format!("{} [{}]: {}\n", level, callsite, msg); let thread = std::thread::current();
let msg = format!(
"{} {:?}/{} [{}]: {}\n",
level,
thread.id(),
thread.name().unwrap_or("unnamed"),
callsite,
msg
);
self.file_handle.write_all(msg.as_bytes())?; self.file_handle.write_all(msg.as_bytes())?;
self.bytes_written += msg.len(); self.bytes_written += msg.len();
Ok(()) Ok(())
@@ -213,16 +221,25 @@ mod tests {
let lines: Vec<&str> = log.lines().collect(); let lines: Vec<&str> = log.lines().collect();
assert!(lines[0].starts_with("I")); assert!(lines[0].starts_with("I"));
assert!(lines[0].contains(format!("{:?}", std::thread::current().id()).as_str()));
assert!(lines[0]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[0].contains("src/log.rs")); assert!(lines[0].contains("src/log.rs"));
assert!(lines[0].contains("deltachat::log::tests")); assert!(lines[0].contains("deltachat::log::tests"));
assert!(lines[0].contains("foo")); assert!(lines[0].contains("foo"));
assert!(lines[1].starts_with("W")); assert!(lines[1].starts_with("W"));
assert!(lines[1].contains(format!("{:?}", std::thread::current().id()).as_str()));
assert!(lines[1]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[1].contains("src/log.rs")); assert!(lines[1].contains("src/log.rs"));
assert!(lines[1].contains("deltachat::log::tests")); assert!(lines[1].contains("deltachat::log::tests"));
assert!(lines[1].contains("bar")); assert!(lines[1].contains("bar"));
assert!(lines[2].starts_with("E")); assert!(lines[2].starts_with("E"));
assert!(lines[2].contains(format!("{:?}", std::thread::current().id()).as_str()));
assert!(lines[2]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[2].contains("src/log.rs")); assert!(lines[2].contains("src/log.rs"));
assert!(lines[2].contains("deltachat::log::tests")); assert!(lines[2].contains("deltachat::log::tests"));
assert!(lines[2].contains("baz")); assert!(lines[2].contains("baz"));