Merge pull request #138 from input-output-hk/rm-stderrlog

remove stderrlog

Author: cameron1024

Cargo.lock

@@ -45,7 +45,6 @@ regex = "1.5"
 serde = "1.0"
 serde_json = "1.0"
 structopt = "0.3"
-stderrlog = "0.5"
 serde_yaml = "0.8.17"
 sscanf = "0.1"
 thiserror = "1.0"
@@ -59,6 +58,7 @@ symmetric-cipher = { git = "https://github.com/input-output-hk/chain-wallet-libs
 graphql_client = "0.10"
 gag = "1"
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
+env_logger = "0.9"
 
 [dev-dependencies]
 rand_chacha = "0.3"

catalyst-toolbox/Cargo.toml

@@ -5,6 +5,7 @@ use structopt::StructOpt as _;
 pub mod cli;
 
 fn main() {
+    env_logger::init();
     cli::Cli::from_args().exec().unwrap_or_else(report_error)
 }
 

catalyst-toolbox/src/bin/catalyst-toolbox.rs

@@ -18,3 +18,18 @@ impl Recover {
         }
     }
 }
+
+fn set_verbosity(verbosity: usize) {
+    if verbosity > 0 {
+        std::env::set_var(
+            "RUST_LOG",
+            match verbosity {
+                0 => unreachable!(),
+                1 => "warn",
+                2 => "info",
+                3 => "debug",
+                _ => "trace",
+            },
+        )
+    }
+}

catalyst-toolbox/src/bin/cli/recovery/mod.rs

@@ -14,6 +14,8 @@ use std::path::PathBuf;
 use reqwest::Url;
 use structopt::StructOpt;
 
+use super::set_verbosity;
+
 #[allow(clippy::large_enum_variant)]
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -89,7 +91,8 @@ impl ReplayCli {
             output_format,
             verbose,
         } = self;
-        stderrlog::new().verbosity(verbose).init().unwrap();
+
+        set_verbosity(verbose);
 
         let block0 = if let Some(path) = block0_path {
             read_block0(path)?

catalyst-toolbox/src/bin/cli/recovery/tally.rs

@@ -1,4 +1,4 @@
-use super::tally::Error;
+use super::{set_verbosity, tally::Error};
 use catalyst_toolbox::recovery::tally::{
     deconstruct_account_transaction, ValidatedFragment, ValidationError, VoteFragmentFilter,
 };
@@ -102,7 +102,8 @@ impl VotesPrintout {
             verbose,
         } = self;
 
-        stderrlog::new().verbosity(verbose).init().unwrap();
+        set_verbosity(verbose);
+
         let reader = std::fs::File::open(block0_path)?;
         let block0 = Block::deserialize(&mut Codec::new(reader)).unwrap();