From 953026c3aef0828990a75178a458a5b8fe4f92ab Mon Sep 17 00:00:00 2001
From: theMackabu <theMackabu@gmail.com>
Date: Fri, 1 Dec 2023 22:25:43 -0800
Subject: [PATCH] rollback to pretty_env_logger
---
Cargo.lock | 12 +++++++++++-
crates/maid/server/Cargo.toml | 2 +-
crates/maid/server/src/main.rs | 6 +++---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 08d7522..13f876b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1343,7 +1343,6 @@ dependencies = [
"clap",
"clap-verbosity-flag",
"colored",
- "env_logger",
"flate2",
"futures",
"futures-core",
@@ -1355,6 +1354,7 @@ dependencies = [
"log",
"macros-rs",
"ntapi",
+ "pretty_env_logger",
"rocket",
"rocket_ws",
"serde",
@@ -1788,6 +1788,16 @@ 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 9337bd7..a35bb47 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"
-env_logger.workspace = true
+pretty_env_logger = "0.5.0"
diff --git a/crates/maid/server/src/main.rs b/crates/maid/server/src/main.rs
index 265f87a..832d027 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, io::Write};
+use std::env;
struct DockerState {
docker: Result<Docker, anyhow::Error>,
@@ -151,10 +151,10 @@ async fn rocket() -> _ {
let http = true;
std::env::set_var("ROCKET_PORT", "3500");
- std::env::set_var("RUST_LOG", "info");
+ std::env::set_var("RUST_LOG", "rocket");
globals::init();
- env_logger::builder().format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args())).init();
+ pretty_env_logger::init();
let socket = async move {
let socket = match http {
--
GitLab