refactor: set filesystem logger with optional file_path & log_level

Replacing the FilesystemLoggerConfig previously used by the
NodeBuilder to configure the logging to the filesystem.

Author: enigbe

bindings/ldk_node.udl

@@ -34,11 +34,6 @@ enum LogLevel {
 	"Error",
 };
 
-dictionary FilesystemLoggerConfig {
-	string? log_file_path;
-	LogLevel? log_level;
-};
-
 dictionary LogRecord {
 	LogLevel level;
 	string args;
@@ -65,7 +60,7 @@ interface Builder {
 	void set_gossip_source_rgs(string rgs_server_url);
 	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(FilesystemLoggerConfig fs_config);
+	void set_filesystem_logger(string? log_file_path, LogLevel? log_level);
 	void set_log_facade_logger(LogLevel log_level);
 	void set_custom_logger(LogWriter log_writer);
 	void set_network(Network network);

src/builder.rs

@@ -329,9 +329,13 @@ impl NodeBuilder {
 		self
 	}
 
-	/// Configures the [`Node`] instance to write logs to the filesystem.
-	pub fn set_filesystem_logger(&mut self, fs_config: FilesystemLoggerConfig) -> &mut Self {
-		self.log_writer_config = Some(LogWriterConfig::File(fs_config));
+	/// Configures the [`Node`] instance to write logs to the filesystem with an optional
+	/// `file_path` and `log_level` arguments.
+	pub fn set_filesystem_logger(
+		&mut self, log_file_path: Option<String>, log_level: Option<LogLevel>,
+	) -> &mut Self {
+		self.log_writer_config =
+			Some(LogWriterConfig::File(FilesystemLoggerConfig { log_file_path, log_level }));
 		self
 	}
 
@@ -648,9 +652,12 @@ impl ArcedNodeBuilder {
 		self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
 	}
 
-	/// Configures the [`Node`] instance to write logs to the filesystem.
-	pub fn set_filesystem_logger(&self, fs_config: FilesystemLoggerConfig) {
-		self.inner.write().unwrap().set_filesystem_logger(fs_config);
+	/// Configures the [`Node`] instance to write logs to the filesystem with an optional
+	/// `file_path` and `log_level` arguments.
+	pub fn set_filesystem_logger(
+		&self, log_file_path: Option<String>, log_level: Option<LogLevel>,
+	) {
+		self.inner.write().unwrap().set_filesystem_logger(log_file_path, log_level);
 	}
 
 	/// Configures the [`Node`] instance to write logs to the `log` facade.

tests/common/mod.rs

@@ -13,8 +13,7 @@ use ldk_node::io::sqlite_store::SqliteStore;
 use ldk_node::logger::LogLevel;
 use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
 use ldk_node::{
-	Builder, CustomTlvRecord, Event, FilesystemLoggerConfig, LightningBalance, Node, NodeError,
-	PendingSweepBalance,
+	Builder, CustomTlvRecord, Event, LightningBalance, Node, NodeError, PendingSweepBalance,
 };
 
 use lightning::ln::msgs::SocketAddress;
@@ -309,9 +308,8 @@ pub(crate) fn setup_node(
 		},
 	}
 
-	let mut fs_config = FilesystemLoggerConfig::default();
-	fs_config.log_level = Some(LogLevel::Gossip);
-	builder.set_filesystem_logger(fs_config);
+	let log_file_path = format!("{}/{}", config.storage_dir_path, "ldk_node.log");
+	builder.set_filesystem_logger(Some(log_file_path), Some(LogLevel::Gossip));
 
 	if let Some(seed) = seed_bytes {
 		builder.set_entropy_seed_bytes(seed).unwrap();

tests/integration_tests_rust.rs

@@ -14,7 +14,7 @@ use common::{
 	setup_node, setup_two_nodes, wait_for_tx, TestChainSource, TestSyncStore,
 };
 
-use ldk_node::config::{EsploraSyncConfig, FilesystemLoggerConfig};
+use ldk_node::config::EsploraSyncConfig;
 use ldk_node::payment::{PaymentKind, QrPaymentResult, SendingParameters};
 use ldk_node::{Builder, Event, NodeError};
 
@@ -216,10 +216,9 @@ fn start_stop_reinit() {
 	sync_config.lightning_wallet_sync_interval_secs = 100000;
 	setup_builder!(builder, config);
 	builder.set_chain_source_esplora(esplora_url.clone(), Some(sync_config));
-	builder.set_filesystem_logger(FilesystemLoggerConfig {
-		log_file_path: Some(format!("{}/{}", config.storage_dir_path, "ldk_node.log")),
-		log_level: Some(Level::Debug),
-	});
+
+	let log_file_path = format!("{}/{}", config.storage_dir_path, "ldk_node.log");
+	builder.set_filesystem_logger(Some(log_file_path), Some(Level::Debug));
 
 	let node = builder.build_with_store(Arc::clone(&test_sync_store)).unwrap();
 	node.start().unwrap();