From 90dba9e8afe782ba9bfb1b82d524957eb3577312 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Sat, 1 Feb 2025 10:22:12 +0100 Subject: [PATCH] Have `set_log_facade_logger` take an *optional* `max_log_level` --- bindings/ldk_node.udl | 2 +- src/builder.rs | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bindings/ldk_node.udl b/bindings/ldk_node.udl index a04455e7a..be2befdba 100644 --- a/bindings/ldk_node.udl +++ b/bindings/ldk_node.udl @@ -61,7 +61,7 @@ interface Builder { void set_liquidity_source_lsps2(SocketAddress address, PublicKey node_id, string? token); void set_storage_dir_path(string storage_dir_path); void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level); - void set_log_facade_logger(LogLevel max_log_level); + void set_log_facade_logger(LogLevel? max_log_level); void set_custom_logger(LogWriter log_writer); void set_network(Network network); [Throws=BuildError] diff --git a/src/builder.rs b/src/builder.rs index 80fa8d79a..81deb7ddf 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -112,7 +112,7 @@ impl Default for LiquiditySourceConfig { #[derive(Clone)] enum LogWriterConfig { File { log_file_path: Option, max_log_level: Option }, - Log(LogLevel), + Log { max_log_level: Option }, Custom(Arc), } @@ -124,7 +124,7 @@ impl std::fmt::Debug for LogWriterConfig { .field("max_log_level", max_log_level) .field("log_file_path", log_file_path) .finish(), - LogWriterConfig::Log(max_log_level) => { + LogWriterConfig::Log { max_log_level } => { f.debug_tuple("Log").field(max_log_level).finish() }, LogWriterConfig::Custom(_) => { @@ -349,8 +349,8 @@ impl NodeBuilder { /// /// If set, the `max_log_level` sets the maximum log level. Otherwise, the latter defaults to /// [`DEFAULT_LOG_LEVEL`]. - pub fn set_log_facade_logger(&mut self, max_log_level: LogLevel) -> &mut Self { - self.log_writer_config = Some(LogWriterConfig::Log(max_log_level)); + pub fn set_log_facade_logger(&mut self, max_log_level: Option) -> &mut Self { + self.log_writer_config = Some(LogWriterConfig::Log { max_log_level }); self } @@ -680,7 +680,7 @@ impl ArcedNodeBuilder { /// /// If set, the `max_log_level` sets the maximum log level. Otherwise, the latter defaults to /// [`DEFAULT_LOG_LEVEL`]. - pub fn set_log_facade_logger(&self, log_level: LogLevel) { + pub fn set_log_facade_logger(&self, log_level: Option) { self.inner.write().unwrap().set_log_facade_logger(log_level); } @@ -1326,7 +1326,10 @@ fn setup_logger( Logger::new_fs_writer(log_file_path, max_log_level) .map_err(|_| BuildError::LoggerSetupFailed)? }, - Some(LogWriterConfig::Log(log_level)) => Logger::new_log_facade(*log_level), + Some(LogWriterConfig::Log { max_log_level }) => { + let max_log_level = max_log_level.unwrap_or_else(|| DEFAULT_LOG_LEVEL); + Logger::new_log_facade(max_log_level) + }, Some(LogWriterConfig::Custom(custom_log_writer)) => { Logger::new_custom_writer(Arc::clone(&custom_log_writer))