libt2n: (gerd) fix & improve logging

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 3972ef4..9187974 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -20,21 +20,58 @@
 #include <sstream>
 
 #include "server.hxx"
+#include "log.hxx"
 
 namespace libt2n
 {
 
+server_connection::server_connection(int _timeout)
+    : connection()
+{
+    set_timeout(_timeout);
+    reset_timeout();
+    connection_id=0;
+    my_server=0;
+}
+
+
+/// get pointer to logging stream, returns NULL if no logging needed
+std::ostream* server_connection::get_logstream(log_level_values level)
+{
+    if (my_server != NULL)
+    {
+        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
 void server_connection::check_timeout()
 {
-    if (timeout != -1 && last_action_time+timeout >= time(NULL))
+    if (timeout != -1 && last_action_time+timeout < time(NULL))
+    {
+        LOGSTREAM(debug,"timeout on connection " << connection_id << ", closing");
         this->close();
+    }
 }
 
+/// reset the timeout, e.g. if something is received
 void server_connection::reset_timeout()
 {
     last_action_time=time(NULL);
 }
 
+server::server()
+{
+    set_default_timeout(30);
+    set_logging(NULL,none);
+    next_id=1;
+}
+
 server::~server()
 {
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
@@ -48,15 +85,25 @@ int server::add_connection(server_connection* newconn)
     newconn->set_id(cid);
     newconn->set_server(this);
     connections[cid]=newconn;
+
+    LOGSTREAM(debug,"new connection accepted, id: " << cid);
+
     return cid;
 }
 
+/// activate logging to the given stream. everything above the given level is logged.
+void server::set_logging(std::ostream *_logstream, log_level_values _log_level)
+{
+    log_level=_log_level;
+    logstream=_logstream;
+}
+
 /**
-    Gets a connection by id
+    @brief Gets a connection by id
     
-    \param conn_id Connection ID
+    @param conn_id Connection ID
     
-    \retval Pointer to connection object
+    @retval Pointer to connection object
 */
 server_connection* server::get_connection(unsigned int conn_id)
 {
@@ -67,6 +114,7 @@ server_connection* server::get_connection(unsigned int conn_id)
         return p->second;
 }
 
+/// check for timeouts, remove closed connections. don't forget to call this from time to time.
 void server::cleanup()
 {
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
@@ -78,6 +126,8 @@ void server::cleanup()
         if (i->second->is_closed() && !i->second->packet_available())
         {
             // closed and no usable data in buffer -> remove
+            LOGSTREAM(debug,"removing conneciton " << i->first << " because it is closed and no more data waiting");
+
             delete i->second;
             connections.erase(i);
             i=connections.begin();
@@ -88,6 +138,12 @@ void server::cleanup()
     }
 }
 
+/** @brief get a complete data packet from any client. The packet is removed from the
+            connection buffer.
+    @param[out] data the data package
+    @param[out] conn_id the connection id we got this packet from
+    @retval true if packet found
+*/
 bool server::get_packet(std::string& data, unsigned int& conn_id)
 {
     // todo: this is somehow unfair: the first connections in the map get checked more
@@ -97,6 +153,8 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         if (i->second->get_packet(data))
         {
+            LOGSTREAM(debug,"got packet (" << data.size() << " bytes) from connection " << i->first);
+
             conn_id=i->first;
             return true;
         }
@@ -104,10 +162,12 @@ bool server::get_packet(std::string& data, unsigned int& conn_id)
     return false;
 }
 
-void server::log(log_level_values level, const char* message)
+/// 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)
-        (*logstream) << message << std::endl;
+    if (logstream && log_level >= level)
+        return logstream;
+    else
+        return NULL;
 }
-
 };