From 0b26338659d94c493162d7ba18d1243b1a7e8483 Mon Sep 17 00:00:00 2001
From: Phuntsok Drak-pa <drakpa@drakpa.fr>
Date: Sun, 25 Mar 2018 15:08:11 +0200
Subject: [PATCH] Further logs improvements

---
 Rust/src/server.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Rust/src/server.rs b/Rust/src/server.rs
index c7ebb49..63d713f 100644
--- a/Rust/src/server.rs
+++ b/Rust/src/server.rs
@@ -112,7 +112,16 @@ fn send_clients_name(to: &SocketAddr, lock: &mut MutexGuard<UserMap>) {
         if client == to {
             let stream = &entry.1;
             let mut writer = BufWriter::new(stream);
-            writeln!(writer, "LIST CLIENTS {}", clients).unwrap();
+            let mut req = String::from("LIST CLIENTS ");
+            req.push_str(clients);
+            println!(
+                "{time} to {nick}@{addr} : {message}",
+                time = get_time(),
+                nick = &entry.0,
+                addr = &entry.1.peer_addr().unwrap(),
+                message = req
+            );
+            writeln!(writer, "{}", req).unwrap();
             writer.flush().unwrap();
             return;
         }
@@ -345,10 +354,11 @@ fn handle_client(stream: TcpStream, clients: Arc<Mutex<UserMap>>) {
                 match input {
                     "BYE" => {
                         println!(
-                            "{time} to client {addr} : {message}",
+                            "{time} to {nick}@{addr} : {message}",
                             time = get_time(),
                             addr = client,
-                            message = "BYE"
+                            message = "BYE",
+                            nick = name
                         );
                         send!("BYE");
                         return Ok(());
@@ -356,10 +366,11 @@ fn handle_client(stream: TcpStream, clients: Arc<Mutex<UserMap>>) {
 
                     "PING" => {
                         println!(
-                            "{time} to client {addr} : {message}",
+                            "{time} to {nick}@{addr} : {message}",
                             time = get_time(),
                             addr = client,
-                            message = "NAME FAILURE"
+                            message = "NAME FAILURE",
+                            nick = name
                         );
                         send!("PONG");
                     }