diff --git a/config_spec.toml b/config_spec.toml index c9c5b6a..1f65c78 100644 --- a/config_spec.toml +++ b/config_spec.toml @@ -43,7 +43,7 @@ type = "String" doc = "The path to the lndk data directory. By default this is stored in ~/.lndk" [[param]] -name = "log_dir" +name = "log_file" type = "String" doc = "The path to the lndk log file. If not specified, defaults to `/lndk.log`." diff --git a/src/main.rs b/src/main.rs index 92ab592..36bd98c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,9 +40,7 @@ async fn main() -> Result<(), ()> { let data_dir = create_data_dir(&config.data_dir) .map_err(|e| println!("Error creating LNDK's data dir {e:?}"))?; - let log_file = config.log_dir.map(PathBuf::from).or(config - // The log_dir configuration is actually a file path, not a directory. So if we are - // falling back to data_dir, append the default log file name to get a file path. + let log_file = config.log_file.map(PathBuf::from).or(config .data_dir .map(|data_dir| PathBuf::from(data_dir).join(DEFAULT_LOG_FILE))); diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 77852d4..a331d89 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -193,8 +193,8 @@ pub async fn setup_lndk( let handler = Arc::new(lndk::OfferHandler::default()); let messenger = lndk::LndkOnionMessenger::new(); - let log_dir = Some(lndk_dir.join(format!("lndk-logs.txt"))); - setup_logger(None, log_dir).unwrap(); + let log_file = Some(lndk_dir.join(format!("lndk-logs.txt"))); + setup_logger(None, log_file).unwrap(); return (lndk_cfg, handler, messenger, shutdown); } diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index 6b7e4b5..ec64402 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -209,8 +209,8 @@ async fn test_lndk_send_invoice_request() { } } - let log_dir = Some(lndk_dir.join(format!("lndk-logs.txt"))); - setup_logger(None, log_dir).unwrap(); + let log_file = Some(lndk_dir.join(format!("lndk-logs.txt"))); + setup_logger(None, log_file).unwrap(); // Make sure lndk successfully sends the invoice_request. let handler = Arc::new(lndk::OfferHandler::default()); @@ -260,8 +260,8 @@ async fn test_lndk_send_invoice_request() { rate_limit_period_secs: 1, }; - let log_dir = Some(lndk_dir.join(format!("lndk-logs.txt"))); - setup_logger(None, log_dir).unwrap(); + let log_file = Some(lndk_dir.join(format!("lndk-logs.txt"))); + setup_logger(None, log_file).unwrap(); let handler = Arc::new(lndk::OfferHandler::default()); let messenger = lndk::LndkOnionMessenger::new();