Skip to content

Commit c8fb1fc

Browse files
committed
Fix log-facade logging
Previously, the log facade logger would always use a `logger` target but then *also* add the correct module path and line as part of the normal log messages. Here, we override the log target correctly. Moreover, we previously would log all messages at the configured *maximum* level, not the level in the log record.
1 parent ecec232 commit c8fb1fc

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/logger.rs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,26 +143,19 @@ impl LogWriter for Writer {
143143
return;
144144
}
145145
macro_rules! log_with_level {
146-
($log_level:expr, $($args:tt)*) => {
146+
($log_level:expr, $target: expr, $($args:tt)*) => {
147147
match $log_level {
148-
LogLevel::Gossip | LogLevel::Trace => trace!($($args)*),
149-
LogLevel::Debug => debug!($($args)*),
150-
LogLevel::Info => info!($($args)*),
151-
LogLevel::Warn => warn!($($args)*),
152-
LogLevel::Error => error!($($args)*),
148+
LogLevel::Gossip | LogLevel::Trace => trace!(target: $target, $($args)*),
149+
LogLevel::Debug => debug!(target: $target, $($args)*),
150+
LogLevel::Info => info!(target: $target, $($args)*),
151+
LogLevel::Warn => warn!(target: $target, $($args)*),
152+
LogLevel::Error => error!(target: $target, $($args)*),
153153
}
154154
};
155155
}
156156

157-
log_with_level!(
158-
max_log_level,
159-
"{} {:<5} [{}:{}] {}",
160-
Utc::now().format("%Y-%m-%d %H:%M:%S"),
161-
record.level,
162-
record.module_path,
163-
record.line,
164-
record.args
165-
)
157+
let target = format!("[{}:{}]", record.module_path, record.line);
158+
log_with_level!(record.level, &target, " {}", record.args)
166159
},
167160
Writer::CustomWriter(custom_logger) => custom_logger.log(record),
168161
}

0 commit comments

Comments
 (0)