diff --git a/Cargo.lock b/Cargo.lock index 13f876bce2db416f88f92b1189deb951b83178fd..08d7522cbc52da26ee38ef03656de20f7f764c0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1343,6 +1343,7 @@ dependencies = [ "clap", "clap-verbosity-flag", "colored", + "env_logger", "flate2", "futures", "futures-core", @@ -1354,7 +1355,6 @@ dependencies = [ "log", "macros-rs", "ntapi", - "pretty_env_logger", "rocket", "rocket_ws", "serde", @@ -1788,16 +1788,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "pretty_number" version = "0.1.0" diff --git a/crates/maid/server/Cargo.toml b/crates/maid/server/Cargo.toml index a35bb47431fa24f07d269e0a817a3bb68bdd4318..9337bd7c3739c1e38fe5f4642b7694f8bcfe67b7 100644 --- a/crates/maid/server/Cargo.toml +++ b/crates/maid/server/Cargo.toml @@ -40,4 +40,4 @@ tokio = { version = "1.33.0", features = ["full"] } serde = { version = "1.0.192", features = ["derive"] } rocket = { version = "0.5.0", features = ["json", "msgpack"] } rocket_ws = "0.1.0" -pretty_env_logger = "0.5.0" +env_logger.workspace = true diff --git a/crates/maid/server/src/main.rs b/crates/maid/server/src/main.rs index 613461ad35606ceeac597e47df1b5e79e0600472..265f87a77ba28224615bc5c6b786046b7b952cb3 100644 --- a/crates/maid/server/src/main.rs +++ b/crates/maid/server/src/main.rs @@ -12,7 +12,7 @@ use rocket::{get, http::Status, launch, outcome::Outcome, routes, State}; use rocket_ws::{Channel, Message, WebSocket}; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; -use std::env; +use std::{env, io::Write}; struct DockerState { docker: Result<Docker, anyhow::Error>, @@ -154,7 +154,7 @@ async fn rocket() -> _ { std::env::set_var("RUST_LOG", "info"); globals::init(); - pretty_env_logger::init(); + env_logger::builder().format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args())).init(); let socket = async move { let socket = match http {