Merge pull request #260 from adamreese/feat/ansi-logging

feat(cli): only use ansi logging on tty

Author: adamreese

Cargo.lock

@@ -31,7 +31,7 @@ server = ["warp", "openid"]
 client = ["mime_guess", "dirs", "time"]
 caching = []
 test-tools = []
-cli = ["clap", "tracing-subscriber"]
+cli = ["clap", "tracing-subscriber", "atty"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -75,6 +75,7 @@ openid = { version = "0.9.3", optional = true }
 bcrypt = "0.10.1"
 either = "1.6.1"
 time = { version = "0.3", features = ["serde"], optional = true }
+atty = {version = "0.2", optional = true}
 
 # NOTE: This is a workaround due to a dependency issue in oauth2: https://github.com/tkaitchuck/ahash/issues/95#issuecomment-903560879
 indexmap = "~1.6.2"

Cargo.toml

@@ -75,7 +75,11 @@ impl TokenManager for PickYourAuth {
 async fn run() -> std::result::Result<(), ClientError> {
     let opts = opts::Opts::parse();
     // TODO: Allow log level setting outside of RUST_LOG (this is easier with this subscriber)
-    tracing_subscriber::fmt::init();
+    tracing_subscriber::fmt()
+        .with_writer(std::io::stderr)
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .with_ansi(atty::is(atty::Stream::Stderr))
+        .init();
     let bindle_dir = opts.bindle_dir.unwrap_or_else(|| {
         dirs::cache_dir()
             .expect("Unable to infer cache directory")

bin/client/main.rs

@@ -157,6 +157,7 @@ async fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt()
         .with_writer(std::io::stderr)
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .with_ansi(atty::is(atty::Stream::Stderr))
         .init();
 
     let config = merged_opts().await?;