Merge pull request #6119 from benesch/term-colors

materialized: don't emit colored log output to stderr if not tty
MaterializeInc · Mar 17, 2021 · 7ee0ed4 · 7ee0ed4
2 parents d463129 + 440fb9b
commit 7ee0ed4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/materialized/Cargo.toml b/src/materialized/Cargo.toml
@@ -30,6 +30,7 @@ name = "materialized-unstable"
 anyhow = "1.0.38"
 askama = { version = "0.10.5", features = ["serde-json"] }
 async-trait = "0.1.48"
+atty = "0.2.14"
 backtrace = "0.3.56"
 build-info = { path = "../build-info" }
 cfg-if = "1.0.0"

diff --git a/src/materialized/src/bin/materialized/main.rs b/src/materialized/src/bin/materialized/main.rs
@@ -412,7 +412,11 @@ fn run(args: Args) -> Result<(), anyhow::Error> {
                 // with the user-specified `env_filter`.
                 tracing_subscriber::registry()
                     .with(env_filter)
-                    .with(fmt::layer().with_writer(io::stderr))
+                    .with(
+                        fmt::layer()
+                            .with_writer(io::stderr)
+                            .with_ansi(atty::is(atty::Stream::Stderr)),
+                    )
                     .init()
             }
             log_file => {
@@ -444,7 +448,9 @@ fn run(args: Args) -> Result<(), anyhow::Error> {
                         })
                     })
                     .with(FilterLayer::new(
-                        fmt::layer().with_writer(io::stderr),
+                        fmt::layer()
+                            .with_writer(io::stderr)
+                            .with_ansi(atty::is(atty::Stream::Stderr)),
                         stderr_level,
                     ))
                     .init()