tizen 2.4 release

[framework/web/wrt-commons.git] / modules / rpc / include / dpl / rpc / generic_socket_rpc_server.h

diff --git a/modules_wearable/rpc/include/dpl/rpc/generic_socket_rpc_server.h b/modules/rpc/include/dpl/rpc/generic_socket_rpc_server.h
similarity index 90%
rename from modules_wearable/rpc/include/dpl/rpc/generic_socket_rpc_server.h
rename to modules/rpc/include/dpl/rpc/generic_socket_rpc_server.h
index a4cae00..30474f3 100644 (file)
--- a/modules_wearable/rpc/include/dpl/rpc/generic_socket_rpc_server.h
+++ b/modules/rpc/include/dpl/rpc/generic_socket_rpc_server.h
@@ -64,20 +64,19 @@ class GenericSocketRPCServer :
             m_internalInterfacesSet.find(server);
 
         if (iterator == m_internalInterfacesSet.end()) {
-            LogPedantic("RPC server interface socket disappeared");
+            WrtLogD("RPC server interface socket disappeared");
             return;
         }
 
         // Accept incoming client
         SocketType *client = static_cast<SocketType *>(server->Accept());
         if (client == NULL) {
-            LogPedantic("Spontaneous accept on socket occurred");
+            WrtLogD("Spontaneous accept on socket occurred");
             return;
         }
 
-        LogPedantic(
-            "Client connected to server: " <<
-            client->GetRemoteAddress().ToString());
+        WrtLogD("Client connected to server: %s",
+                client->GetRemoteAddress().ToString().c_str());
 
         // Open specific connection implementation
         AbstractRPCConnection *connection = OpenSpecificConnection(client);
@@ -106,7 +105,7 @@ class GenericSocketRPCServer :
 
     AbstractRPCConnectionID Open(const Address &socketAddress)
     {
-        LogPedantic("Starting server: " << socketAddress.ToString());
+        WrtLogD("Starting server: %s", socketAddress.ToString().c_str());
 
         // Alloc new socket
         SocketType *socket = new SocketType();
@@ -133,7 +132,7 @@ class GenericSocketRPCServer :
                 ::RemoveListener(this);
 
             // Log debug
-            LogPedantic("Cannot start server: " << socketAddress.ToString());
+            WrtLogD("Cannot start server: %s", socketAddress.ToString().c_str());
 
             // Problem with server startup
             ReThrowMsg(typename Exception::OpenFailed, socketAddress.ToString());
@@ -143,9 +142,8 @@ class GenericSocketRPCServer :
         m_internalInterfacesSet.insert(socket);
 
         // Debug info
-        LogPedantic(
-            "Server started on interface: " <<
-            socket->GetLocalAddress().ToString());
+        WrtLogD("Server started on interface: %s",
+                socket->GetLocalAddress().ToString().c_str());
 
         // Return unique identifier
         return static_cast<AbstractRPCConnectionID>(socket);
@@ -153,7 +151,7 @@ class GenericSocketRPCServer :
 
     void Close(AbstractRPCConnectionID connectionID)
     {
-        LogPedantic("Closing server interface...");
+        WrtLogD("Closing server interface...");
 
         // Get socket from ID
         SocketType *socket = static_cast<SocketType *>(connectionID);
@@ -177,7 +175,7 @@ class GenericSocketRPCServer :
         m_internalInterfacesSet.erase(iterator);
 
         // Done
-        LogPedantic("Closed");
+        WrtLogD("Closed");
     }
 
     void CloseAll()