index : static-web-server.git

61d4bb2feccc10c2cced956afa7dcdd00b5ef01f [patch]

149bac84f5fcce6e7f9e265dffc8bb873e197ccc

ea0facd15e7540a20a6ae0b97517eb1c878e2a4b

61d4bb2feccc10c2cced956afa7dcdd00b5ef01f.tar.gz

refactor: restore terminal colors previouly disabled by 76fd7ea

possible via `tracing-subscriber 0.3.16` update (ea0facd)

Diff

 Cargo.lock    | 17 +++++++++++++++++
 Cargo.toml    |  2 +-
 src/logger.rs |  6 ++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index fdfd876..3f99e10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -646,6 +646,16 @@ dependencies = [
]

[[package]]
name = "nu-ansi-term"
version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
dependencies = [
 "overload",
 "winapi",
]

[[package]]
name = "num-integer"
version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -687,6 +697,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"

[[package]]
name = "overload"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"

[[package]]
name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1230,6 +1246,7 @@ version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
dependencies = [
 "nu-ansi-term",
 "parking_lot",
 "sharded-slab",
 "smallvec",
diff --git a/Cargo.toml b/Cargo.toml
index 8a6d3d7..0fe0235 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,7 @@ tokio-rustls = { version = "0.23" }
tokio-util = { version = "0.7", default-features = false, features = ["io"] }
toml = "0.5"
tracing = { version = "0.1", default-features = false, features = ["std"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["smallvec", "parking_lot", "fmt", "tracing-log"] }
tracing-subscriber = { version = "0.3", default-features = false, features = ["smallvec", "parking_lot", "fmt", "ansi", "tracing-log"] }

[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.tikv-jemallocator]
version = "0.5"
diff --git a/src/logger.rs b/src/logger.rs
index 43798ac..1540a4c 100644
--- a/src/logger.rs
+++ b/src/logger.rs
@@ -18,10 +18,16 @@ pub fn init(log_level: &str) -> Result {
fn configure(level: &str) -> Result {
    let level = level.parse::<Level>()?;

    #[cfg(unix)]
    let enable_ansi = true;
    #[cfg(windows)]
    let enable_ansi = false;

    match tracing_subscriber::fmt()
        .with_writer(std::io::stderr)
        .with_max_level(level)
        .with_span_events(FmtSpan::CLOSE)
        .with_ansi(enable_ansi)
        .try_init()
    {
        Err(err) => Err(anyhow!(err)),