Add client id to received event log

RemcoSmitsDev · Dec 25, 2024 · 8fd50c5 · 8fd50c5
1 parent 15f8b29
commit 8fd50c5
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/crates/dap/src/client.rs b/crates/dap/src/client.rs
@@ -74,13 +74,21 @@ impl DebugAdapterClient {
         let (server_rx, server_tx) = self.transport_delegate.reconnect(cx).await?;
         log::info!("Successfully reconnected to debug adapter");
 
+        let client_id = self.id;
+
         // start handling events/reverse requests
         cx.update(|cx| {
             cx.spawn({
                 let server_tx = server_tx.clone();
                 |mut cx| async move {
-                    Self::handle_receive_messages(server_rx, server_tx, message_handler, &mut cx)
-                        .await
+                    Self::handle_receive_messages(
+                        client_id,
+                        server_rx,
+                        server_tx,
+                        message_handler,
+                        &mut cx,
+                    )
+                    .await
                 }
             })
             .detach_and_log_err(cx);
@@ -94,20 +102,29 @@ impl DebugAdapterClient {
         let (server_rx, server_tx) = self.transport_delegate.start(&self.binary, cx).await?;
         log::info!("Successfully connected to debug adapter");
 
+        let client_id = self.id;
+
         // start handling events/reverse requests
         cx.update(|cx| {
             cx.spawn({
                 let server_tx = server_tx.clone();
                 |mut cx| async move {
-                    Self::handle_receive_messages(server_rx, server_tx, message_handler, &mut cx)
-                        .await
+                    Self::handle_receive_messages(
+                        client_id,
+                        server_rx,
+                        server_tx,
+                        message_handler,
+                        &mut cx,
+                    )
+                    .await
                 }
             })
             .detach_and_log_err(cx);
         })
     }
 
     async fn handle_receive_messages<F>(
+        client_id: DebugAdapterClientId,
         server_rx: Receiver<Message>,
         client_tx: Sender<Message>,
         mut event_handler: F,
@@ -124,7 +141,7 @@ impl DebugAdapterClient {
 
             if let Err(e) = match message {
                 Message::Event(ev) => {
-                    log::debug!("Received event `{}`", &ev);
+                    log::debug!("Client {} received event `{}`", client_id.0, &ev);
 
                     cx.update(|cx| event_handler(Message::Event(ev), cx))
                 }