Enable the FFI/JNI logger even for INFO level messages

shesek · shesek · commit 35fc49fdcd73 · 2021-01-06T04:38:19.000+02:00
And add a separate `setup_logger` option for disabling logging entirely.
diff --git a/doc/libbwt.md b/doc/libbwt.md
@@ -120,6 +120,8 @@ If bitcoind is running locally on the default port, at the default datadir locat
 - `poll_interval` - interval for polling new blocks/transactions from bitcoind in seconds (defaults to 5)
 - `tx_broadcast_cmd` - [custom command](https://github.com/shesek/bwt#scriptable-transaction-broadcast) for broadcasting transactions
 - `verbose` - verbosity level for stderr log messages (0-4, defaults to 0)
+- `require_addresses` - when disabled, the daemon will start even without any configured wallet addresses (defaults to true)
+- `setup_logger` - initialize logging via `pretty_env_logger` or `android_logger` (defaults to true)
 
 #### Electrum
 - `electrum_addr` - bind address for electrum server (off by default)
diff --git a/src/config.rs b/src/config.rs
@@ -354,6 +354,11 @@ pub struct Config {
     #[cfg_attr(feature = "cli", structopt(skip = true))]
     #[serde(default = "default_true")]
     pub require_addresses: bool,
+
+    // Not exposed as a CLI option, always set to true for CLI use
+    #[cfg_attr(feature = "cli", structopt(skip = true))]
+    #[serde(default = "default_true")]
+    pub setup_logger: bool,
 }
 
 impl Config {
@@ -455,6 +460,10 @@ impl Config {
 
     #[cfg(any(feature = "pretty_env_logger", feature = "android_logger"))]
     pub fn setup_logger(&self) {
+        if !self.setup_logger {
+            return;
+        }
+
         #[cfg(feature = "pretty_env_logger")]
         let mut builder = apply_log_env(if self.timestamp {
             pretty_env_logger::formatted_timed_builder()
@@ -642,6 +651,7 @@ defaultable!(Config,
     initial_import_size=350,
     poll_interval=time::Duration::from_secs(5),
     require_addresses=true,
+    setup_logger=true,
   )
 );
 
diff --git a/src/interface.rs b/src/interface.rs
@@ -37,10 +37,8 @@ mod ffi {
 
         let start = || -> Result<_> {
             let config: Config = serde_json::from_str(json_config).context("Invalid config")?;
-            if config.verbose > 0 {
-                // The verbosity level cannot be changed once enabled.
-                INIT_LOGGER.call_once(|| config.setup_logger());
-            }
+            // The verbosity level cannot be changed once enabled.
+            INIT_LOGGER.call_once(|| config.setup_logger());
 
             let (progress_tx, progress_rx) = mpsc::channel();
             spawn_recv_progress_thread(progress_rx, callback_fn);
@@ -139,10 +137,8 @@ mod jni {
 
         let start = || -> Result<_> {
             let config: Config = serde_json::from_str(&json_config).context("Invalid config")?;
-            if config.verbose > 0 {
-                // The verbosity level cannot be changed once enabled.
-                INIT_LOGGER.call_once(|| config.setup_logger());
-            }
+            // The verbosity level cannot be changed once enabled.
+            INIT_LOGGER.call_once(|| config.setup_logger());
 
             let (progress_tx, progress_rx) = mpsc::channel();
             spawn_recv_progress_thread(progress_rx, jvm, callback_g);
