refactor: remove log facade level

This is now considered unnecessary because the
concrete implementation of the facade has control
over the maximum log level that can be configured.

Author: enigbe

bindings/ldk_node.udl

@@ -74,7 +74,7 @@ interface Builder {
 	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, 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();
 	void set_custom_logger(LogWriter log_writer);
 	void set_network(Network network);
 	[Throws=BuildError]

src/builder.rs

@@ -113,7 +113,7 @@ struct LiquiditySourceConfig {
 #[derive(Clone)]
 enum LogWriterConfig {
 	File { log_file_path: Option<String>, max_log_level: Option<LogLevel> },
-	Log { max_log_level: Option<LogLevel> },
+	Log,
 	Custom(Arc<dyn LogWriter>),
 }
 
@@ -125,9 +125,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 } => {
-				f.debug_tuple("Log").field(max_log_level).finish()
-			},
+			LogWriterConfig::Log => write!(f, "LogWriterConfig::Log"),
 			LogWriterConfig::Custom(_) => {
 				f.debug_tuple("Custom").field(&"<config internal to custom log writer>").finish()
 			},
@@ -385,11 +383,8 @@ impl NodeBuilder {
 	}
 
 	/// Configures the [`Node`] instance to write logs to the [`log`](https://crates.io/crates/log) facade.
-	///
-	/// 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: Option<LogLevel>) -> &mut Self {
-		self.log_writer_config = Some(LogWriterConfig::Log { max_log_level });
+	pub fn set_log_facade_logger(&mut self) -> &mut Self {
+		self.log_writer_config = Some(LogWriterConfig::Log);
 		self
 	}
 
@@ -750,11 +745,8 @@ impl ArcedNodeBuilder {
 	}
 
 	/// Configures the [`Node`] instance to write logs to the [`log`](https://crates.io/crates/log) facade.
-	///
-	/// 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: Option<LogLevel>) {
-		self.inner.write().unwrap().set_log_facade_logger(log_level);
+	pub fn set_log_facade_logger(&self) {
+		self.inner.write().unwrap().set_log_facade_logger();
 	}
 
 	/// Configures the [`Node`] instance to write logs to the provided custom [`LogWriter`].
@@ -1421,10 +1413,7 @@ fn setup_logger(
 			Logger::new_fs_writer(log_file_path, max_log_level)
 				.map_err(|_| BuildError::LoggerSetupFailed)?
 		},
-		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::Log) => Logger::new_log_facade(),
 
 		Some(LogWriterConfig::Custom(custom_log_writer)) => {
 			Logger::new_custom_writer(Arc::clone(&custom_log_writer))

src/logger.rs

@@ -108,7 +108,7 @@ pub(crate) enum Writer {
 	/// Writes logs to the file system.
 	FileWriter { file_path: String, max_log_level: LogLevel },
 	/// Forwards logs to the `log` facade.
-	LogFacadeWriter { max_log_level: LogLevel },
+	LogFacadeWriter,
 	/// Forwards logs to a custom writer.
 	CustomWriter(Arc<dyn LogWriter>),
 }
@@ -138,10 +138,7 @@ impl LogWriter for Writer {
 					.write_all(log.as_bytes())
 					.expect("Failed to write to log file")
 			},
-			Writer::LogFacadeWriter { max_log_level } => {
-				if record.level < *max_log_level {
-					return;
-				}
+			Writer::LogFacadeWriter => {
 				macro_rules! log_with_level {
 					($log_level:expr, $target: expr, $($args:tt)*) => {
 						match $log_level {
@@ -186,8 +183,8 @@ impl Logger {
 		Ok(Self { writer: Writer::FileWriter { file_path, max_log_level } })
 	}
 
-	pub fn new_log_facade(max_log_level: LogLevel) -> Self {
-		Self { writer: Writer::LogFacadeWriter { max_log_level } }
+	pub fn new_log_facade() -> Self {
+		Self { writer: Writer::LogFacadeWriter }
 	}
 
 	pub fn new_custom_writer(log_writer: Arc<dyn LogWriter>) -> Self {
@@ -204,10 +201,7 @@ impl LdkLogger for Logger {
 				}
 				self.writer.log(record.into());
 			},
-			Writer::LogFacadeWriter { max_log_level } => {
-				if record.level < *max_log_level {
-					return;
-				}
+			Writer::LogFacadeWriter => {
 				self.writer.log(record.into());
 			},
 			Writer::CustomWriter(_arc) => {

tests/common/logging.rs

@@ -10,7 +10,7 @@ use std::sync::{Arc, Mutex};
 #[derive(Clone)]
 pub(crate) enum TestLogWriter {
 	FileWriter,
-	LogFacade(LogLevel),
+	LogFacade,
 	Custom(Arc<dyn LogWriter>),
 }
 

tests/common/mod.rs

@@ -328,8 +328,8 @@ pub(crate) fn setup_node(
 		TestLogWriter::FileWriter => {
 			builder.set_filesystem_logger(None, None);
 		},
-		TestLogWriter::LogFacade(max_log_level) => {
-			builder.set_log_facade_logger(Some(*max_log_level));
+		TestLogWriter::LogFacade => {
+			builder.set_log_facade_logger();
 		},
 		TestLogWriter::Custom(custom_log_writer) => {
 			builder.set_custom_logger(Arc::clone(custom_log_writer));

tests/integration_tests_rust.rs

@@ -10,15 +10,14 @@ mod common;
 use common::{
 	do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event,
 	expect_payment_received_event, expect_payment_successful_event, generate_blocks_and_wait,
-	logging::{init_custom_logger, init_log_logger, validate_log_entry, TestLogWriter},
+	logging::{init_log_logger, validate_log_entry, TestLogWriter},
 	open_channel, premine_and_distribute_funds, random_config, setup_bitcoind_and_electrsd,
 	setup_builder, setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
 use ldk_node::config::EsploraSyncConfig;
 use ldk_node::liquidity::LSPS2ServiceConfig;
 
-use ldk_node::logger::LogLevel;
 use ldk_node::payment::{
 	ConfirmationStatus, PaymentDirection, PaymentKind, PaymentStatus, QrPaymentResult,
 	SendingParameters,
@@ -1156,7 +1155,7 @@ fn facade_logging() {
 
 	let logger = init_log_logger(LevelFilter::Trace);
 	let mut config = random_config(false);
-	config.log_writer = TestLogWriter::LogFacade(LogLevel::Gossip);
+	config.log_writer = TestLogWriter::LogFacade;
 
 	println!("== Facade logging starts ==");
 	let _node = setup_node(&chain_source, config, None);