fix: restore the log crate

along with its max log level restrictions to quiet excessive logging - include env_logger - update spin per RUSTSEC-2019-0013 Closes #115
mozilla-services · Sep 19, 2019 · 8d28c86 · 8d28c86
1 parent dbd47e9
commit 8d28c86
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/autopush-common/Cargo.toml b/autopush-common/Cargo.toml
@@ -23,6 +23,7 @@ httparse = "1.3.4"
 # XXX: pin to hyper 0.11 for now: 0.12 has many changes..
 hyper = "0.11.27"
 lazy_static = "1.3.0"
+log = { version = "0.4.8", features = ["max_level_info", "release_max_level_info"] }
 mozsvc-common = "0.1.1"
 rand = "0.7.0"
 regex = "1.2.0"

diff --git a/autopush/Cargo.toml b/autopush/Cargo.toml
@@ -21,6 +21,7 @@ cadence = "0.17.1"
 chan-signal = "0.3.2"
 config = "0.9.3"
 docopt = "1.1.0"
+env_logger = "0.6.2"
 error-chain = "0.12.1"
 fernet = "0.1.0"
 futures = "0.1.28"
@@ -29,6 +30,7 @@ httparse = "1.3.4"
 # XXX: pin to hyper 0.11 for now: 0.12 has many changes..
 hyper = "0.11.27"
 lazy_static = "1.3.0"
+log = { version = "0.4.8", features = ["max_level_info", "release_max_level_info"] }
 mozsvc-common = "0.1.1"
 openssl = "0.10.24"
 reqwest = "0.9.19"

diff --git a/autopush/src/main.rs b/autopush/src/main.rs
@@ -8,6 +8,7 @@ use std::env;
 
 use chan_signal::Signal;
 use docopt::Docopt;
+use env_logger;
 
 use autopush_common::errors::{Result, ResultExt};
 
@@ -37,6 +38,7 @@ struct Args {
 }
 
 fn main() -> Result<()> {
+    env_logger::init();
     let signal = chan_signal::notify(&[Signal::INT, Signal::TERM]);
     let args: Args = Docopt::new(USAGE)
         .and_then(|d| d.deserialize())