fix: init logger only once, use tracing setup

Closes: #849
trustification · Sep 24, 2024 · 258ce7c · 258ce7c
1 parent ae78b03
commit 258ce7c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -9,7 +9,6 @@ license.workspace = true
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
-env_logger = { workspace = true }
 langchain-rust = { workspace = true, features = ["ollama"] }
 log = { workspace = true }
 nu-ansi-term = { workspace = true }

diff --git a/xtask/src/dataset.rs b/xtask/src/dataset.rs
@@ -1,4 +1,3 @@
-use crate::log::init_log;
 use anyhow::anyhow;
 use clap::Parser;
 use postgresql_commands::{pg_dump::PgDumpBuilder, CommandBuilder};
@@ -82,8 +81,6 @@ impl GenerateDump {
     }
 
     pub async fn run(self) -> anyhow::Result<()> {
-        init_log()?;
-
         let (db, postgres) = match &self.working_dir {
             Some(wd) => db::embedded::create_in(wd.join("db")).await?,
             None => db::embedded::create().await?,

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -1,6 +1,7 @@
 #![allow(clippy::unwrap_used)]
 #![recursion_limit = "256"]
 
+use crate::log::init_log;
 use clap::{Parser, Subcommand};
 
 mod ai;
@@ -44,6 +45,6 @@ pub enum Command {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    env_logger::init();
+    init_log()?;
     Xtask::parse().run().await
 }