feat: add ability to specify log location (#6459)

Add the ability to specify a log location from the command line
tari-project · Aug 8, 2024 · 124bfd4 · 124bfd4
1 parent 540be2c
commit 124bfd4
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/applications/minotari_app_utilities/src/common_cli_args.rs b/applications/minotari_app_utilities/src/common_cli_args.rs
@@ -22,7 +22,6 @@
 use std::{error::Error, path::PathBuf};
 
 use clap::Args;
-use log::Level;
 use tari_common::configuration::{ConfigOverrideProvider, Network};
 
 #[derive(Args, Debug)]
@@ -43,8 +42,9 @@ pub struct CommonCliArgs {
     #[clap(short, long, alias = "log_config")]
     pub log_config: Option<PathBuf>,
 
-    #[clap()]
-    pub log_level: Option<Level>,
+    /// The path to where logs should be stored
+    #[clap(long, alias = "log_path")]
+    pub log_path: Option<PathBuf>,
 
     /// Supply a network (overrides existing configuration)
     #[clap(long, env = "TARI_NETWORK")]

diff --git a/applications/minotari_console_wallet/src/lib.rs b/applications/minotari_console_wallet/src/lib.rs
@@ -81,8 +81,8 @@ pub fn run_wallet(shutdown: &mut Shutdown, runtime: Runtime, config: &mut Applic
             base_path: data_dir_str,
             config: config_path.into_os_string().into_string().unwrap(),
             log_config: None,
-            log_level: None,
             network: None,
+            log_path: None,
             config_property_overrides: vec![],
         },
         password: None,

diff --git a/applications/minotari_console_wallet/src/main.rs b/applications/minotari_console_wallet/src/main.rs
@@ -71,9 +71,10 @@ fn main_inner() -> Result<(), ExitError> {
     let cli = Cli::parse();
 
     let cfg = load_configuration(cli.common.config_path(), true, cli.non_interactive_mode, &cli)?;
+    let base_path = cli.common.get_base_path();
     initialize_logging(
         &cli.common.log_config_path("wallet"),
-        &cli.common.get_base_path(),
+        cli.common.log_path.as_ref().unwrap_or(&base_path),
         include_str!("../log4rs_sample.yml"),
     )?;
 

diff --git a/applications/minotari_merge_mining_proxy/src/main.rs b/applications/minotari_merge_mining_proxy/src/main.rs
@@ -53,10 +53,10 @@ async fn main() -> Result<(), anyhow::Error> {
     }
 
     let cli = Cli::parse();
-
+    let base_path = cli.common.get_base_path();
     initialize_logging(
         &cli.common.log_config_path("proxy"),
-        &cli.common.get_base_path(),
+        cli.common.log_path.as_ref().unwrap_or(&base_path),
         include_str!("../log4rs_sample.yml"),
     )?;
     match run_merge_miner::start_merge_miner(cli).await {

diff --git a/applications/minotari_node/src/lib.rs b/applications/minotari_node/src/lib.rs
@@ -77,7 +77,7 @@ pub async fn run_base_node(
             base_path: data_dir_str,
             config: config_path.into_os_string().into_string().unwrap(),
             log_config: None,
-            log_level: None,
+            log_path: None,
             network: None,
             config_property_overrides: vec![],
         },

diff --git a/applications/minotari_node/src/main.rs b/applications/minotari_node/src/main.rs
@@ -110,9 +110,10 @@ fn main_inner() -> Result<(), ExitError> {
         console_subscriber::init();
     }
 
+    let base_path = cli.common.get_base_path();
     initialize_logging(
         &cli.common.log_config_path("base_node"),
-        &cli.common.get_base_path(),
+        cli.common.log_path.as_ref().unwrap_or(&base_path),
         include_str!("../log4rs_sample.yml"),
     )?;
     info!(

diff --git a/integration_tests/src/merge_mining_proxy.rs b/integration_tests/src/merge_mining_proxy.rs
@@ -96,7 +96,7 @@ impl MergeMiningProxyProcess {
                     base_path: data_dir_str,
                     config: config_path.into_os_string().into_string().unwrap(),
                     log_config: None,
-                    log_level: None,
+                    log_path: None,
                     network: Some("localnet".to_string().try_into().unwrap()),
                     config_property_overrides: vec![
                         ("merge_mining_proxy.listener_address".to_string(), proxy_full_address),

diff --git a/integration_tests/src/miner.rs b/integration_tests/src/miner.rs
@@ -117,7 +117,7 @@ impl MinerProcess {
                 base_path: data_dir_str,
                 config: config_path.into_os_string().into_string().unwrap(),
                 log_config: None,
-                log_level: None,
+                log_path: None,
                 config_property_overrides: vec![
                     (
                         "miner.base_node_grpc_address".to_string(),

diff --git a/integration_tests/src/wallet_process.rs b/integration_tests/src/wallet_process.rs
@@ -212,7 +212,7 @@ pub fn get_default_cli() -> Cli {
             base_path: Default::default(),
             config: Default::default(),
             log_config: None,
-            log_level: None,
+            log_path: None,
             network: None,
             config_property_overrides: vec![],
         },