From a5be9f187b24edc22f8fe22093aff1a5c1c530dd Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 2 Jun 2024 03:21:58 +0700 Subject: [PATCH] use tracing_subscriber, handle subscription error --- Cargo.lock | 135 ++++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 1 + src/main.rs | 26 ++------- src/ws/handler.rs | 19 +++++-- 4 files changed, 156 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ef3311..70108d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -703,6 +712,15 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matchit" version = "0.7.3" @@ -759,6 +777,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -837,6 +865,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.2" @@ -967,6 +1001,50 @@ dependencies = [ "bitflags 2.5.0", ] +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + [[package]] name = "reqwest" version = "0.12.4" @@ -1107,6 +1185,7 @@ dependencies = [ "tokio", "toml", "tower-http", + "tracing-subscriber", "uuid", ] @@ -1206,6 +1285,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -1322,6 +1410,16 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -1499,6 +1597,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "chrono", + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -1585,6 +1714,12 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" diff --git a/Cargo.toml b/Cargo.toml index 47f719f..5647169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,6 +35,7 @@ rand = "0.8.5" axum = { version = "0.7.5", features = ["ws", "macros", "http2"] } tower-http = { version = "0.5.2", features = ["trace"] } tokio = { version = "1.37.0", features = ["full"] } +tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] } # TODO: Sort it! # TODO: Replace Vec and &[u8] by Bytes diff --git a/src/main.rs b/src/main.rs index a9bfec3..b424508 100644 --- a/src/main.rs +++ b/src/main.rs @@ -98,28 +98,12 @@ pub struct AppState { #[tokio::main] async fn main() -> Result<()> { - println!("The Sculptor"); - let colors = ColoredLevelConfig::new() - .info(Color::Green) - .debug(Color::Magenta) - .trace(Color::Cyan) - .warn(Color::Yellow); - fern::Dispatch::new() - .format(move |out, message, record| { - out.finish(format_args!( - "[{} {} {}] {}", - Local::now().to_rfc3339_opts(SecondsFormat::Millis, true), - colors.color(record.level()), - record.target(), - message - )) - }) - .level(log::LevelFilter::Info) - // .level_for("hyper", log::LevelFilter::Info) - .chain(std::io::stdout()) - .chain(fern::log_file("output.log")?) - .apply()?; + tracing_subscriber::fmt::fmt() + .with_env_filter("tracing") + .pretty() + .init(); + info!("The Sculptor MMSI edition v{}", env!("CARGO_PKG_VERSION")); // Config let config = config::Config::parse("Config.toml".into()); let listen = config.listen.as_str(); diff --git a/src/ws/handler.rs b/src/ws/handler.rs index 6c05145..0028619 100644 --- a/src/ws/handler.rs +++ b/src/ws/handler.rs @@ -206,10 +206,21 @@ async fn subscribe( return; } msg = rx.recv() => { - if socket.send(msg.unwrap()).await.is_err() { - error!("Forced shutdown SUB due error!"); - return; - }; + + let msg = msg.ok(); + + if let Some(msg) = msg { + // debug!("[WebSocketSubscriber] Received: {msg}"); + if socket.send(msg.clone()).await.is_err() { + error!("Forced shutdown SUB due error!"); + return; + }; + } + + // if socket.send(msg.unwrap()).await.is_err() { + // error!("Forced shutdown SUB due error!"); + // return; + // }; } } }