Skip to content

Fix module_path/line numbers in log facade logging #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 1 commit into from
May 27, 2025
Merged

Fix module_path/line numbers in log facade logging #547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions src/logger.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ pub(crate) use lightning::{log_bytes, log_debug, log_error, log_info, log_trace}
pub use lightning::util::logger::Level as LogLevel;

use chrono::Utc;
use log::{debug, error, info, trace, warn};
use log::Level as LogFacadeLevel;
use log::Record as LogFacadeRecord;

#[cfg(not(feature = "uniffi"))]
use core::fmt;
Expand Down Expand Up @@ -139,20 +140,32 @@ impl LogWriter for Writer {
.expect("Failed to write to log file")
},
Writer::LogFacadeWriter => {
macro_rules! log_with_level {
($log_level:expr, $target: expr, $($args:tt)*) => {
match $log_level {
LogLevel::Gossip | LogLevel::Trace => trace!(target: $target, $($args)*),
LogLevel::Debug => debug!(target: $target, $($args)*),
LogLevel::Info => info!(target: $target, $($args)*),
LogLevel::Warn => warn!(target: $target, $($args)*),
LogLevel::Error => error!(target: $target, $($args)*),
}
};
}

let target = format!("[{}:{}]", record.module_path, record.line);
log_with_level!(record.level, &target, " {}", record.args)
let mut builder = LogFacadeRecord::builder();

match record.level {
LogLevel::Gossip | LogLevel::Trace => builder.level(LogFacadeLevel::Trace),
LogLevel::Debug => builder.level(LogFacadeLevel::Debug),
LogLevel::Info => builder.level(LogFacadeLevel::Info),
LogLevel::Warn => builder.level(LogFacadeLevel::Warn),
LogLevel::Error => builder.level(LogFacadeLevel::Error),
};

#[cfg(not(feature = "uniffi"))]
log::logger().log(
&builder
.module_path(Some(record.module_path))
.line(Some(record.line))
.args(format_args!("{}", record.args))
.build(),
);
#[cfg(feature = "uniffi")]
log::logger().log(
&builder
.module_path(Some(&record.module_path))
.line(Some(record.line))
.args(format_args!("{}", record.args))
.build(),
);
},
Writer::CustomWriter(custom_logger) => custom_logger.log(record),
}
Expand Down
Loading