libt2n: (gerd) fix & improve logging

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 14f4e2a..9187974 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -39,7 +39,14 @@ server_connection::server_connection(int _timeout)
 std::ostream* server_connection::get_logstream(log_level_values level)
 {
     if (my_server != NULL)
-        return my_server->get_logstream(level);
+    {
+        std::ostream* ostr=my_server->get_logstream(level);
+        if (ostr != NULL)
+            (*ostr) << "connection " << get_id() << ": ";
+        return ostr;
+    }
+    else
+        return NULL;
 }
 
 /// check if timeout is expired, close connection if so
@@ -158,7 +165,9 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
 /// get pointer to logging stream, returns NULL if no logging needed
 std::ostream* server::get_logstream(log_level_values level)
 {
-    if (logstream && level >= log_level)
+    if (logstream && log_level >= level)
         return logstream;
+    else
+        return NULL;
 }
 };