From 3302411daad7507b70b475cc29b9a0a9494d1675 Mon Sep 17 00:00:00 2001 From: _ <> Date: Tue, 16 Mar 2021 14:50:52 +0000 Subject: [PATCH] ptth_relay: update tokio, trying to find this bug --- Cargo.lock | 4 ++-- crates/ptth_relay/Cargo.toml | 2 +- crates/ptth_relay/src/server_endpoint.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 073673a..d182b0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2379,9 +2379,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" dependencies = [ "autocfg 1.0.1", "bytes", diff --git a/crates/ptth_relay/Cargo.toml b/crates/ptth_relay/Cargo.toml index d3ebf3e..6fafc5c 100644 --- a/crates/ptth_relay/Cargo.toml +++ b/crates/ptth_relay/Cargo.toml @@ -24,7 +24,7 @@ rmp-serde = "0.14.4" serde = { version = "1.0.117", features = ["derive"] } serde_json = "1.0.60" thiserror = "1.0.22" -tokio = { version = "1.2.0", features = [] } +tokio = { version = "1.3.0", features = [] } tokio-stream = "0.1.3" toml = "0.5.7" tracing = "0.1.25" diff --git a/crates/ptth_relay/src/server_endpoint.rs b/crates/ptth_relay/src/server_endpoint.rs index 359452f..18e779b 100644 --- a/crates/ptth_relay/src/server_endpoint.rs +++ b/crates/ptth_relay/src/server_endpoint.rs @@ -127,7 +127,7 @@ pub async fn handle_listen ( }, Ok (Err (ShuttingDownError::ShuttingDown)) => Ok (error_reply (StatusCode::SERVICE_UNAVAILABLE, "Server is shutting down, try again soon")?), Err (e) => { - error! ("{}", e); + error! ("{} {}", watcher_code, e); Ok (error_reply (StatusCode::INTERNAL_SERVER_ERROR, "Server error")?) }, },