feat: optimize log

Author: cyejing

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "shuttle"
-version = "0.6.8"
+version = "0.6.9"
 edition = "2021"
 publish = false
 

Cargo.toml

@@ -68,9 +68,7 @@ impl DialConn {
             let conn_sender = ConnSender::new(conn_id, tx);
             context.with_conn_id(conn_id);
             context.set_conn_sender(conn_sender).await;
-            if let Err(e) = exchange_copy(stream, rx, context.clone()).await {
-                debug!("exchange copy close: {}", e);
-            }
+            exchange_copy(stream, rx, context.clone()).await;
             context.remove_conn_sender().await;
         });
         Ok(())

src/rathole/cmd/dial.rs

@@ -101,7 +101,7 @@ impl HoleServer {
             let (tx, rx) = mpsc::channel(1);
 
             let conn_id = self.id_adder.add_and_get().await;
-            info!("Hole accept proxy conn {conn_id}");
+            info!("Hole accept proxy conn ({conn_id})");
             let conn_sender = ConnSender::new(conn_id, tx);
             self.context.set_conn_sender(conn_sender).await;
 
@@ -111,9 +111,7 @@ impl HoleServer {
             let dial = Command::Dial(Dial::new(conn_id, self.local_addr.clone()));
             context.command_sender.send_sync(dial).await?;
             tokio::spawn(async move {
-                if let Err(e) = exchange_copy(ts, rx, context.clone()).await {
-                    debug!("exchange copy close : {}", e);
-                }
+                exchange_copy(ts, rx, context.clone()).await;
                 context.remove_conn_sender().await;
             });
         }

src/rathole/cmd/hole.rs

@@ -102,11 +102,7 @@ async fn handle<T: AsyncRead + AsyncWrite + Unpin + Send + 'static>(
     rx.await.context("Dispatcher stop")?
 }
 
-async fn exchange_copy(
-    ts: TcpStream,
-    mut rx: mpsc::Receiver<Bytes>,
-    context: context::Context,
-) -> anyhow::Result<()> {
+async fn exchange_copy(ts: TcpStream, mut rx: mpsc::Receiver<Bytes>, context: context::Context) {
     let (mut r, mut w) = io::split(ts);
     let mut shutdown = context.notify_shutdown.subscribe();
     info!(
@@ -120,12 +116,14 @@ async fn exchange_copy(
             debug!("exchange recv shutdown signal");
             Ok(())
         }
-    }?;
+    }
+    .inspect_err(|e| debug!("exchange copy faield {e}"))
+    .ok();
+
     info!(
         "stop stream copy by exchange conn_id: {:?}",
         context.current_conn_id
     );
-    Ok(())
 }
 
 async fn read_bytes(r: &mut ReadHalf<TcpStream>, context: context::Context) -> anyhow::Result<()> {