revert unexpected changes in #997

parseablehq · Nov 28, 2024 · 1dc2e14 · 1dc2e14
1 parent e93e099
commit 1dc2e14
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,6 @@ clap = { version = "4.1", default-features = false, features = [
 clokwerk = "0.4"
 crossterm = "0.28.1"
 derive_more = "0.99.18"
-env_logger = "0.11.3"
 fs_extra = "1.3"
 futures = "0.3"
 futures-util = "0.3.28"
@@ -89,6 +88,7 @@ tokio = { version = "1.28", default-features = false, features = [
     "fs",
 ] }
 tokio-stream = { version = "0.1", features = ["fs"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 ulid = { version = "1.0", features = ["serde"] }
 uptime_lib = "0.3.0"
 xxhash-rust = { version = "0.8", features = ["xxh3"] }

diff --git a/src/main.rs b/src/main.rs
@@ -21,10 +21,14 @@ use parseable::{
     option::{Mode, CONFIG},
     rbac, storage, IngestServer, ParseableServer, QueryServer, Server,
 };
+use tracing_subscriber::EnvFilter;
 
 #[actix_web::main]
 async fn main() -> anyhow::Result<()> {
-    env_logger::init();
+    tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .compact()
+        .init();
 
     // these are empty ptrs so mem footprint should be minimal
     let server: Box<dyn ParseableServer> = match CONFIG.parseable.mode {