From 3438b340a9bdb39e730cb0b6fa5e03d8d7d3eb48 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 7 Apr 2024 12:41:06 -0400 Subject: [PATCH] remove comments, log channel errors Signed-off-by: strawberry --- src/service/admin/mod.rs | 9 +++------ src/service/presence/mod.rs | 4 ++-- src/service/sending/mod.rs | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 5754a435..c16c5e95 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -183,12 +183,9 @@ impl Service { } drop(state_lock); } - Err(_) => { - // TODO: Handle error, Im too unfamiliar with the codebase to know what to do here - - - // recv_async returns an error if all senders have been dropped. If the channel is empty, the returned future will yield to the async runtime. - + Err(e) => { + // generally shouldn't happen + error!("Failed to receive admin room event from channel: {e}"); } } } diff --git a/src/service/presence/mod.rs b/src/service/presence/mod.rs index 5f64d30a..5d15f9e7 100644 --- a/src/service/presence/mod.rs +++ b/src/service/presence/mod.rs @@ -181,8 +181,8 @@ impl Service { presence_timers.push(presence_timer(user_id, timeout)); } Err(e) => { - // TODO: Handle error better? I have no idea what to do here. - error!("Failed to receive presence timer: {}", e); + // generally shouldn't happen + error!("Failed to receive presence timer through channel: {e}"); } } } diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index 74f1d436..31051d69 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -342,7 +342,6 @@ impl Service { }, event = receiver.recv_async() => { - // TODO: Error handling for this if let Ok((outgoing_kind, event, key)) = event { if let Ok(Some(events)) = self.select_events( &outgoing_kind,