From 6b7c4ba0b04e95963be08b09cd9568c92c701c54 Mon Sep 17 00:00:00 2001
From: Razz4780 <msmolarekg@gmail.com>
Date: Tue, 26 Mar 2024 17:16:52 +0100
Subject: [PATCH] Fixed tokio::select in outgoing interceptor

---
 .../src/proxies/outgoing/interceptor.rs       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mirrord/intproxy/src/proxies/outgoing/interceptor.rs b/mirrord/intproxy/src/proxies/outgoing/interceptor.rs
index 3492c9801e2..5dcf053d49c 100644
--- a/mirrord/intproxy/src/proxies/outgoing/interceptor.rs
+++ b/mirrord/intproxy/src/proxies/outgoing/interceptor.rs
@@ -62,18 +62,20 @@ impl BackgroundTask for Interceptor {
                     },
                 },
 
-                Some(bytes) = message_bus.recv() => {
-                    if bytes.is_empty() {
-                        tracing::trace!("outgoing interceptor -> agent shutdown, shutting down connection with layer");
-                        connected_socket.shutdown().await?;
-                    } else {
-                        connected_socket.send(&bytes).await?;
+                msg = message_bus.recv() => match msg {
+                    Some(bytes) => {
+                        if bytes.is_empty() {
+                            tracing::trace!("outgoing interceptor -> agent shutdown, shutting down connection with layer");
+                            connected_socket.shutdown().await?;
+                        } else {
+                            connected_socket.send(&bytes).await?;
+                        }
                     }
-                },
 
-                else => {
-                    tracing::trace!("outgoing interceptor -> no more messages from the agent, exiting");
-                    break Ok(())
+                    None => {
+                        tracing::trace!("outgoing interceptor -> no more messages from the agent, exiting");
+                        break Ok(())
+                    }
                 },
             }
         }