From ce7c8ab02a20e4ac14ddb0b9bc08474e4a67256d Mon Sep 17 00:00:00 2001
From: theMackabu <theMackabu@gmail.com>
Date: Fri, 1 Dec 2023 22:23:11 -0800
Subject: [PATCH] use writeln
---
Cargo.lock | 12 +-----------
crates/maid/server/Cargo.toml | 2 +-
crates/maid/server/src/main.rs | 4 ++--
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 13f876b..08d7522 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 a35bb47..9337bd7 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 613461a..265f87a 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 {
--
GitLab