Don't panic on Logger setup failure

Author: tnull

bindings/ldk_node.udl

@@ -125,6 +125,7 @@ enum BuildError {
 	"WriteFailed",
 	"StoragePathAccessFailed",
 	"WalletSetupFailed",
+	"LoggerSetupFailed",
 };
 
 [Enum]

src/builder.rs

@@ -84,6 +84,8 @@ pub enum BuildError {
 	StoragePathAccessFailed,
 	/// We failed to setup the onchain wallet.
 	WalletSetupFailed,
+	/// We failed to setup the logger.
+	LoggerSetupFailed,
 }
 
 impl fmt::Display for BuildError {
@@ -97,6 +99,7 @@ impl fmt::Display for BuildError {
 			Self::WriteFailed => write!(f, "Failed to write to store."),
 			Self::StoragePathAccessFailed => write!(f, "Failed to access the given storage path."),
 			Self::WalletSetupFailed => write!(f, "Failed to setup onchain wallet."),
+			Self::LoggerSetupFailed => write!(f, "Failed to setup the logger."),
 		}
 	}
 }
@@ -377,7 +380,10 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 		config.storage_dir_path,
 		chrono::offset::Local::now().format("%Y_%m_%d")
 	);
-	let logger = Arc::new(FilesystemLogger::new(log_file_path.clone(), config.log_level));
+	let logger = Arc::new(
+		FilesystemLogger::new(log_file_path.clone(), config.log_level)
+			.map_err(|_| BuildError::LoggerSetupFailed)?,
+	);
 
 	// Initialize the on-chain wallet and chain access
 	let seed_bytes = match entropy_source_config {

src/logger.rs

@@ -16,7 +16,7 @@ pub(crate) struct FilesystemLogger {
 }
 
 impl FilesystemLogger {
-	pub(crate) fn new(file_path: String, level: Level) -> Self {
+	pub(crate) fn new(file_path: String, level: Level) -> Result<Self, ()> {
 		if let Some(parent_dir) = Path::new(&file_path).parent() {
 			fs::create_dir_all(parent_dir).expect("Failed to create log parent directory");
 
@@ -25,21 +25,17 @@ impl FilesystemLogger {
 				.create(true)
 				.append(true)
 				.open(file_path.clone())
-				.expect("Failed to open log file");
+				.map_err(|_| ())?;
 
 			// Create a symlink to the current log file, with prior cleanup
 			let log_file_symlink = parent_dir.join("ldk_node_latest.log");
 			if log_file_symlink.as_path().exists() && log_file_symlink.as_path().is_symlink() {
-				fs::remove_file(&log_file_symlink)
-					.expect("Failed to remove an old symlink for the log file");
+				fs::remove_file(&log_file_symlink).map_err(|_| ())?;
 			}
-			symlink(&file_path, &log_file_symlink).expect(&format!(
-				"Failed to create symlink for the log file: {:?}",
-				log_file_symlink
-			));
+			symlink(&file_path, &log_file_symlink).map_err(|_| ())?;
 		}
 
-		Self { file_path, level }
+		Ok(Self { file_path, level })
 	}
 }
 impl Logger for FilesystemLogger {