diff --git a/Cargo.lock b/Cargo.lock index 30c9457..e6dbef0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -247,6 +247,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -390,6 +399,30 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + [[package]] name = "ring" version = "0.16.20" @@ -610,9 +643,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" dependencies = [ "ansi_term", + "matchers", + "once_cell", + "regex", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", "tracing-log", ] diff --git a/Cargo.toml b/Cargo.toml index 39757c8..a9235b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ pin-project-lite = "0.2" rustls = {version = "0.20", default-features = false} sha1 = "0.10" tracing = "0.1" -tracing-subscriber = "0.3" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } webpki-roots = "0.22" [profile.release] diff --git a/src/main.rs b/src/main.rs index 62f2580..ca9b370 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,8 @@ use std::{rc::Rc, sync::Arc}; use clap::{Parser, Subcommand}; use monoio::net::TcpListener; -use tracing::{error, info, Level}; +use tracing::{error, info}; +use tracing_subscriber::{fmt, prelude::*, EnvFilter}; use crate::{client::ShadowTlsClient, server::ShadowTlsServer, util::set_tcp_keepalive}; @@ -68,7 +69,10 @@ enum Commands { } fn main() { - tracing_subscriber::fmt().with_max_level(Level::INFO).init(); + tracing_subscriber::registry() + .with(fmt::layer()) + .with(EnvFilter::from_default_env()) + .init(); let args = Arc::new(Args::parse()); let mut threads = Vec::new(); let parallelism = get_parallelism(&args);