From 970575de8d699224d7f331eb82b57474eaf96d56 Mon Sep 17 00:00:00 2001
From: Ferdinand Schober <ferdinandschober20@gmail.com>
Date: Sun, 14 Jul 2024 14:03:36 +0200
Subject: [PATCH] simplify

---
 src/server.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/server.rs b/src/server.rs
index e75fd5b..d4008a2 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -193,13 +193,13 @@ impl Server {
                     log::debug!("handled frontend request");
                 }
                 _ = self.notifies.frontend_event_pending.notified() => {
-                    let events = self
-                        .pending_frontend_events
-                        .borrow_mut()
-                        .drain(..)
-                        .collect::<Vec<_>>();
-                    for event in events {
-                        frontend.broadcast(event).await;
+                    loop {
+                        let event = self.pending_frontend_events.borrow_mut().pop_front();
+                        if let Some(event) = event {
+                            frontend.broadcast(event).await;
+                        } else {
+                            break;
+                        }
                     }
                 },
                 _ = self.notifies.dns_request_pending.notified() => {
@@ -561,12 +561,11 @@ fn handle_frontend_stream(
     cancel: CancellationToken,
     #[cfg(unix)] stream: ReadHalf<UnixStream>,
     #[cfg(windows)] stream: ReadHalf<TcpStream>,
-    request_channel: Sender<FrontendRequest>,
+    request_tx: Sender<FrontendRequest>,
 ) -> JoinHandle<()> {
-    let tx = request_channel.clone();
     tokio::task::spawn_local(async move {
         tokio::select! {
-            _ = listen_frontend(tx, stream) => {},
+            _ = listen_frontend(request_tx, stream) => {},
             _ = cancel.cancelled() => {},
         }
     })