fix inproper client lag handling

1 files changed, 15 insertions, 11 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 25fdb9c4..f81ee38c 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -128,18 +128,22 @@ async fn run() -> anyhow::Result<()> {
                 }
             }
             loop {
-                let packet = match tokio::select!(
-                   p = rx.recv() => p.ok(),
-                   p = error_rx.recv() => p,
-                ) {
-                    Some(p) => p,
-                    None => {
-                        rx = rx.resubscribe();
-                        PacketC::ServerMessage {
-                            text: "Lagging behind. Some clientbound packets were dropped."
-                                .to_string(),
+                let Some(packet) = tokio::select!(
+                   p = rx.recv() => Some(match p {
+                        Ok(e) => e,
+                        Err(e) => {
+                            rx = rx.resubscribe();
+                            warn!("client was lagging. resubscribed: {e}");
+                            PacketC::ServerMessage {
+                                text: "Lagging behind. Some clientbound packets were dropped."
+                                    .to_string(),
+                            }
                         }
-                    }
+                   }),
+                   p = error_rx.recv() => p
+                ) else {
+                    info!("client outbound sender dropped. closing connection");
+                    break;
                 };
                 if let Err(e) = write
                     .send(tokio_tungstenite::tungstenite::Message::Text(