Move logging to derived class

Author: freshthinking

examples/tcp_client_example.cpp

@@ -16,8 +16,16 @@ class TCPClient : public slick_socket::TCPClientBase<TCPClient>
     {
     }
 
-    void onConnected() {}
-    void onDisconnected() {}
+    void onConnected()
+    {
+        logger_.logInfo("Successfully connected to server");
+    }
+
+    void onDisconnected()
+    {
+        logger_.logInfo("Successfully disconnected from server");
+    }
+
     void onData(const uint8_t* data, size_t length)
     {
         std::string received_data((const char*)data, length);

examples/tcp_server_example.cpp

@@ -10,8 +10,16 @@ class TCPServer : public slick_socket::TCPServerBase<TCPServer>
     {
     }
 
-    void onClientConnected(int client_id, const std::string& client_address) {}
-    void onClientDisconnected(int client_id) {}
+    void onClientConnected(int client_id, const std::string& client_address)
+    {
+        logger_.logInfo("{} client connected: ID={}, Address={}", name_, client_id, client_address);
+    }
+
+    void onClientDisconnected(int client_id)
+    {
+        logger_.logInfo("{} client disconnected: ID={}", name_, client_id);
+    }
+
     void onClientData(int client_id, const uint8_t* data, size_t length)
     {
         std::string msg((char*)data, length);

include/slick_socket/tcp_client_unix.h

@@ -111,7 +111,6 @@ inline bool TCPClientBase<DerivedT, LoggerT>::connect()
     connected_.store(true, std::memory_order_release);
     client_thread_ = std::thread(&TCPClientBase::client_loop, this);
     derived().onConnected();
-    logger_.logInfo("Successfully connected to server");
     return true;
 }
 

include/slick_socket/tcp_server_unix.h

@@ -319,7 +319,6 @@ void TCPServerBase<DrivedT, LoggerT>::accept_new_client()
 
     // Notify about new client
     derived().onClientConnected(client_id, client_address);
-    logger_.logInfo("{} client connected: ID={}, Address={}", name_, client_id, client_address);
 }
 
 template<typename DrivedT, typename LoggerT>
@@ -343,21 +342,19 @@ void TCPServerBase<DrivedT, LoggerT>::handle_client_data(int client_id, std::vec
     {
         // Client disconnected
         close(socket);
+        clients_.erase(it);
         // Notify about client disconnection
         derived().onClientDisconnected(client_id);
-        logger_.logInfo("{} client disconnected: ID={}", name_, client_id);
-        clients_.erase(it);
     }
     else
     {
         // Error
         if (errno != EAGAIN && errno != EWOULDBLOCK)
         {
-            logger_.logError("Receive error for client");
+            logger_.logError("Receive error for client ID={}", client_id);
             close(socket);
-            derived().onClientDisconnected(client_id);
-            logger_.logInfo("{} client disconnected: ID={}", name_, client_id);
             clients_.erase(it);
+            derived().onClientDisconnected(client_id);
         }
     }
 }

include/slick_socket/tcp_server_win32.h

@@ -315,7 +315,6 @@ void TCPServerBase<DrivedT, LoggerT>::accept_new_client()
 
     // Notify about new client
     derived().onClientConnected(client_id, client_address);
-    logger_.logInfo("{} client connected: ID={}, Address={}", name_, client_id, client_address);
 }
 
 template<typename DrivedT, typename LoggerT>
@@ -338,22 +337,20 @@ void TCPServerBase<DrivedT, LoggerT>::handle_client_data(int client_id, std::vec
     {
         // Client disconnected
         closesocket(socket);
+        clients_.erase(it);
         // Notify about client disconnection
         derived().onClientDisconnected(client_id);
-        logger_.logInfo("{} client disconnected: ID={}", name_, client_id);
-        clients_.erase(it);
     }
     else
     {
         // Error
         int error = WSAGetLastError();
         if (error != WSAEWOULDBLOCK)
         {
-            logger_.logError("Receive error for client");
+            logger_.logError("Receive error for client ID={}", client_id);
             closesocket(socket);
-            derived().onClientDisconnected(client_id);
-            logger_.logInfo("{} client disconnected: ID={}", name_, client_id);
             clients_.erase(it);
+            derived().onClientDisconnected(client_id);
         }
     }
 }