tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-23 13:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

update loggers

Browse Source
This commit is contained in:
ClementTsang 2025-04-13 04:30:12 -04:00
parent 55b924a946
commit a614cbbea9
No known key found for this signature in database
GPG Key ID: DC3B7867D8D97095
1 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/utils/logging.rs
View File

@ -49,7 +49,7 @@ macro_rules! error {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::error!($($x)*) log::error!($($x)*);
} }
}; };
} }
@ -59,7 +59,7 @@ macro_rules! warn {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::warn!($($x)*) log::warn!($($x)*);
} }
}; };
} }
@ -69,7 +69,7 @@ macro_rules! info {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::info!($($x)*) log::info!($($x)*);
} }
}; };
} }
@ -79,7 +79,7 @@ macro_rules! debug {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::debug!($($x)*) log::debug!($($x)*);
} }
}; };
} }
@ -89,7 +89,7 @@ macro_rules! trace {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::trace!($($x)*) log::trace!($($x)*);
} }
}; };
} }
@ -99,25 +99,71 @@ macro_rules! log {
($($x:tt)*) => { ($($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::log!(log::Level::Trace, $($x)*) log::log!(log::Level::Trace, $($x)*);
} }
}; };
($level:expr, $($x:tt)*) => { ($level:expr, $($x:tt)*) => {
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
{ {
log::log!($level, $($x)*) log::log!($level, $($x)*);
}
};
}
#[macro_export]
macro_rules! info_every_n_secs {
($n:expr, $($x:tt)*) => {
#[cfg(feature = "logging")]
{
crate::log_every_n_secs!(log::Level::Info, $n, $($x)*);
}
};
}
#[macro_export]
macro_rules! log_every_n_secs {
($level:expr, $n:expr, $($x:tt)*) => {
#[cfg(feature = "logging")]
{
static LAST_LOG: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
let since_last_log = LAST_LOG.load(std::sync::atomic::Ordering::Relaxed);
let now = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).expect("should be valid").as_secs();
if now - since_last_log > $n {
LAST_LOG.store(now, std::sync::atomic::Ordering::Relaxed);
log::log!($level, $($x)*);
}
} }
}; };
} }
#[cfg(test)] #[cfg(test)]
mod test { mod test {
#[cfg(feature = "logging")]
/// We do this to ensure that the test logger is only initialized _once_ for
/// things like the default test runner that run tests in the same process.
///
/// This doesn't do anything if you use something like nextest, which runs
/// a test-per-process, but that's fine.
fn init_test_logger() {
use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering;
static LOG_INIT: AtomicBool = AtomicBool::new(false);
if LOG_INIT.load(Ordering::SeqCst) {
return;
}
LOG_INIT.store(true, Ordering::SeqCst);
super::init_logger(log::LevelFilter::Trace, None)
.expect("initializing the logger should succeed");
}
#[cfg(feature = "logging")] #[cfg(feature = "logging")]
#[test] #[test]
fn test_logging_macros() { fn test_logging_macros() {
super::init_logger(log::LevelFilter::Trace, None) init_test_logger();
.expect("initializing the logger should succeed");
error!("This is an error."); error!("This is an error.");
warn!("This is a warning."); warn!("This is a warning.");
@ -125,4 +171,12 @@ mod test {
debug!("This is a debug."); debug!("This is a debug.");
info!("This is a trace."); info!("This is a trace.");
} }
#[cfg(feature = "logging")]
#[test]
fn test_log_every_macros() {
init_test_logger();
info_every_n_secs!(10, "This is an info every 10 seconds.");
}
} }