From 6734917d9c0babea2d18ec8f72ec4e4045154851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 18 Sep 2021 19:47:19 +0200
Subject: [PATCH] minor fix

---
 src/group_handler/mod.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/group_handler/mod.rs b/src/group_handler/mod.rs
index cd10a11..db000b3 100644
--- a/src/group_handler/mod.rs
+++ b/src/group_handler/mod.rs
@@ -214,8 +214,6 @@ impl GroupHandle {
             }
 
             'rx: loop {
-                // TODO add timeout to catch lock-ups!
-
                 if next_save < Instant::now() {
                     grp_trace!(self, "Save time elapsed, saving if needed");
                     self.save_if_needed().await.log_error("Failed to save group");
@@ -234,13 +232,13 @@ impl GroupHandle {
                     break 'rx;
                 }
 
-                grp_trace!(self, "Waiting for message");
                 let timeout = next_save
                     .saturating_duration_since(Instant::now())
                     .min(remains_to_idle_close)
                     .min(remains_to_retire)
                     .max(Duration::from_secs(1)); // at least 1s
 
+                grp_debug!(self, "Wait for message {:?}", timeout);
                 match tokio::time::timeout(timeout, events.next()).await {
                     Ok(Some(event)) => {
                         last_rx = Instant::now();
@@ -265,18 +263,6 @@ impl GroupHandle {
                         // Timeout so we can save if needed
                     }
                 }
-
-                /* ping is nice, but pleroma still sometimes doesnt send
-                notifs after a while, just let it expire */
-
-                // if last_ping.elapsed() > PING_INTERVAL {
-                //     last_ping = Instant::now();
-                //     grp_trace!(self, "Pinging");
-                //     if events.send_ping()
-                //         .await.is_err() {
-                //         break 'rx;
-                //     }
-                // }
             }
 
             grp_warn!(self, "Notif stream closed, will reopen");