Make LdkNodeLogger techncially customizable, retain default behavior.

Author: domZippilli

src/builder.rs

@@ -16,7 +16,9 @@ use crate::io::sqlite_store::SqliteStore;
 use crate::io::utils::{read_node_metrics, write_node_metrics};
 use crate::io::vss_store::VssStore;
 use crate::liquidity::LiquiditySource;
-use crate::logger::{log_error, log_info, LdkNodeLogger, Logger};
+use crate::logger::{
+	default_format, log_error, log_info, FilesystemLogWriter, LdkNodeLogger, Logger,
+};
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::payment::store::PaymentStore;
 use crate::peer_store::PeerStore;
@@ -1236,10 +1238,15 @@ fn setup_logger(config: &Config) -> Result<Arc<LdkNodeLogger>, BuildError> {
 		Some(log_dir) => String::from(log_dir),
 		None => config.storage_dir_path.clone() + "/logs",
 	};
-
+	let filesystem_log_writer =
+		FilesystemLogWriter::new(log_dir.clone()).map_err(|_| BuildError::LoggerSetupFailed)?;
 	Ok(Arc::new(
-		LdkNodeLogger::new(log_dir, config.log_level)
-			.map_err(|_| BuildError::LoggerSetupFailed)?,
+		LdkNodeLogger::new(
+			config.log_level,
+			Box::new(default_format),
+			Box::new(move |s| filesystem_log_writer.write(s)),
+		)
+		.map_err(|_| BuildError::LoggerSetupFailed)?,
 	))
 }
 

src/logger.rs

@@ -12,19 +12,50 @@ use lightning::util::logger::{Level, Record};
 
 use chrono::Utc;
 
+use std::fmt::Debug;
 use std::fs;
 use std::io::Write;
 #[cfg(not(target_os = "windows"))]
 use std::os::unix::fs::symlink;
 use std::path::Path;
+use std::sync::Mutex;
 
-pub(crate) struct LdkNodeLogger {
-	file_path: String,
+pub struct LdkNodeLogger {
 	level: Level,
+	formatter: Box<dyn Fn(&Record) -> String + Send + Sync>,
+	writer: Box<dyn Fn(&String) + Send + Sync>,
 }
 
 impl LdkNodeLogger {
-	pub(crate) fn new(log_dir: String, level: Level) -> Result<Self, ()> {
+	pub fn new(
+		level: Level, formatter: Box<dyn Fn(&Record) -> String + Send + Sync>,
+		writer: Box<dyn Fn(&String) + Send + Sync>,
+	) -> Result<Self, ()> {
+		Ok(Self { level, formatter, writer })
+	}
+}
+
+impl Debug for LdkNodeLogger {
+	fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+		write!(f, "LdkNodeLogger level: {}", self.level)
+	}
+}
+
+impl Logger for LdkNodeLogger {
+	fn log(&self, record: Record) {
+		if record.level < self.level {
+			return;
+		}
+		(self.writer)(&(self.formatter)(&record))
+	}
+}
+
+pub(crate) struct FilesystemLogWriter {
+	log_file: Mutex<fs::File>,
+}
+
+impl FilesystemLogWriter {
+	pub fn new(log_dir: String) -> Result<Self, ()> {
 		let log_file_name =
 			format!("ldk_node_{}.log", chrono::offset::Local::now().format("%Y_%m_%d"));
 		let log_file_path = format!("{}/{}", log_dir, log_file_name);
@@ -53,29 +84,33 @@ impl LdkNodeLogger {
 			}
 		}
 
-		Ok(Self { file_path: log_file_path, level })
-	}
-}
-impl Logger for LdkNodeLogger {
-	fn log(&self, record: Record) {
-		if record.level < self.level {
-			return;
-		}
-		let raw_log = record.args.to_string();
-		let log = format!(
-			"{} {:<5} [{}:{}] {}\n",
-			Utc::now().format("%Y-%m-%d %H:%M:%S"),
-			record.level.to_string(),
-			record.module_path,
-			record.line,
-			raw_log
+		let log_file = Mutex::new(
+			fs::OpenOptions::new()
+				.create(true)
+				.append(true)
+				.open(log_file_path.clone())
+				.map_err(|e| eprintln!("ERROR: Failed to open log file: {}", e))?,
 		);
-		fs::OpenOptions::new()
-			.create(true)
-			.append(true)
-			.open(self.file_path.clone())
-			.expect("Failed to open log file")
+		Ok(Self { log_file })
+	}
+
+	pub fn write(&self, log: &String) {
+		self.log_file
+			.lock()
+			.expect("log file lock poisoned")
 			.write_all(log.as_bytes())
 			.expect("Failed to write to log file")
 	}
 }
+
+pub(crate) fn default_format(record: &Record) -> String {
+	let raw_log = record.args.to_string();
+	format!(
+		"{} {:<5} [{}:{}] {}\n",
+		Utc::now().format("%Y-%m-%d %H:%M:%S"),
+		record.level.to_string(),
+		record.module_path,
+		record.line,
+		raw_log
+	)
+}