server: fix live logs

typhon-ci · Oct 10, 2023 · 9707f75 · 9707f75
1 parent 74bf88c
commit 9707f75
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/typhon/src/logs.rs b/typhon/src/logs.rs
@@ -45,14 +45,17 @@ pub mod live {
                             if !state.contains_key(&id) {
                                 state.insert(id.clone(), (vec![], Vec::new()));
                             }
-                            let (lines, listeners) = state.get_mut(&id).unwrap();
+                            let (lines, ref mut listeners) = state.get_mut(&id).unwrap();
                             lines.push(line.clone());
 
-                            for i in 0..listeners.len() {
-                                if let Err(_) = listeners[i].send(line.clone()).await {
-                                    listeners.remove(i);
+                            let mut new_listeners: Listeners = Vec::new();
+                            for listener in listeners.drain(..) {
+                                match listener.send(line.clone()).await {
+                                    Ok(()) => new_listeners.push(listener),
+                                    Err(_) => (),
                                 }
                             }
+                            *listeners = new_listeners;
                         }
                         Message::Listen {
                             id,