Improve server logging and use central player id counter (close #450)

1 files changed, 9 insertions, 10 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index 93147d45..b5db4859 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -199,7 +199,7 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
             warn!("Invalid ws handshake");
             continue;
         };
-        info!("{addr} connected via websocket");
+        info!("{id} Client connected ({addr})");
 
         let (mut write, mut read) = sock.split();
         let state = state.clone();
@@ -219,7 +219,7 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                     ))
                     .await
                 {
-                    warn!("WebSocket error when sending initial packets: {e}");
+                    warn!("{id} WebSocket error when sending initial packets: {e}");
                     return;
                 }
             }
@@ -229,7 +229,7 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                         Ok(e) => e,
                         Err(e) => {
                             rx = rx.resubscribe();
-                            warn!("Client was lagging; resubscribed: {e}");
+                            warn!("{id} Client was lagging; resubscribed: {e}");
                             PacketC::ServerMessage {
                                 message: trm!("s.state.overflow_resubscribe"),
                                 error: true,
@@ -238,7 +238,7 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                    }),
                    p = error_rx.recv() => p
                 ) else {
-                    info!("Client outbound sender dropped. closing connection");
+                    info!("{id} Client outbound sender dropped. closing connection");
                     break;
                 };
                 // let message = if supports_binary.load(Ordering::Relaxed) {
@@ -251,20 +251,19 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                 let message = Message::Text(serde_json::to_string(&packet).unwrap().into());
                 // };
                 if let Err(e) = write.send(message).await {
-                    warn!("WebSocket error: {e}");
+                    warn!("{id} WebSocket error: {e}");
                     break;
                 }
             }
         });
 
         spawn(async move {
-            info!("{id:?} connected");
             while let Some(Ok(message)) = read.next().await {
                 let packet = match message {
                     Message::Text(line) if line.len() < 8196 => match serde_json::from_str(&line) {
                         Ok(p) => p,
                         Err(e) => {
-                            warn!("Invalid json packet: {e}");
+                            warn!("{id} Invalid json packet: {e}");
                             break;
                         }
                     },
@@ -287,9 +286,9 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                     packet,
                     PacketS::Movement { .. } | PacketS::ReplayTick { .. }
                 ) {
-                    trace!("<- {id:?} {packet:?}");
+                    trace!("{id} <- {packet:?}");
                 } else {
-                    debug!("<- {id:?} {packet:?}");
+                    debug!("{id} <- {packet:?}");
                 }
                 let packet_out = match state.write().await.packet_in_outer(id, packet).await {
                     Ok(packets) => packets,
@@ -305,7 +304,7 @@ async fn run(data_path: PathBuf, args: Args) -> anyhow::Result<()> {
                     let _ = error_tx.send(packet).await;
                 }
             }
-            info!("{id:?} disconnected");
+            info!("{id} Client disconnected");
             let _ = state.write().await.disconnect(id).await;
         });
     }