projects
/
framework
/
web
/
wrt-commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen 2.4 release
[framework/web/wrt-commons.git]
/
modules
/
rpc
/
include
/
dpl
/
rpc
/
generic_socket_rpc_client.h
diff --git
a/modules_mobile/rpc/include/dpl/rpc/generic_socket_rpc_client.h
b/modules/rpc/include/dpl/rpc/generic_socket_rpc_client.h
similarity index 91%
rename from
modules_mobile/rpc/include/dpl/rpc/generic_socket_rpc_client.h
rename to
modules/rpc/include/dpl/rpc/generic_socket_rpc_client.h
index
9629e61
..
2749a17
100644
(file)
--- a/
modules_mobile/rpc/include/dpl/rpc/generic_socket_rpc_client.h
+++ b/
modules/rpc/include/dpl/rpc/generic_socket_rpc_client.h
@@
-58,7
+58,7
@@
class GenericSocketRPCClient :
// Retrieve socket sender
SocketType *socket = static_cast<SocketType *>(event.GetSender());
// Retrieve socket sender
SocketType *socket = static_cast<SocketType *>(event.GetSender());
-
LogPedantic
("Connection with RPC server established");
+
WrtLogD
("Connection with RPC server established");
// Is this connection still tracked ?
// It might have disappeared on close
// Is this connection still tracked ?
// It might have disappeared on close
@@
-66,7
+66,7
@@
class GenericSocketRPCClient :
m_internalConnectionSet.find(socket);
if (iterator == m_internalConnectionSet.end()) {
m_internalConnectionSet.find(socket);
if (iterator == m_internalConnectionSet.end()) {
-
LogPedantic
("RPC client connection socket disappeared");
+
WrtLogD
("RPC client connection socket disappeared");
return;
}
return;
}
@@
-102,7
+102,7
@@
class GenericSocketRPCClient :
AbstractRPCConnectionID Open(const Address &socketAddress)
{
AbstractRPCConnectionID Open(const Address &socketAddress)
{
-
LogPedantic("Starting client: " << socketAddress.ToString
());
+
WrtLogD("Starting client: %s", socketAddress.ToString().c_str
());
// Alloc new socket
SocketType *socket = new SocketType();
// Alloc new socket
SocketType *socket = new SocketType();
@@
-126,7
+126,7
@@
class GenericSocketRPCClient :
ConnectedEvent>::RemoveListener(this);
// Log debug message
ConnectedEvent>::RemoveListener(this);
// Log debug message
-
LogPedantic("Cannot connect to: " << socketAddress.ToString
());
+
WrtLogD("Cannot connect to: %s", socketAddress.ToString().c_str
());
// Problem with client startup
ReThrowMsg(typename Exception::OpenFailed, socketAddress.ToString());
// Problem with client startup
ReThrowMsg(typename Exception::OpenFailed, socketAddress.ToString());
@@
-136,9
+136,9
@@
class GenericSocketRPCClient :
m_internalConnectionSet.insert(socket);
// Debug info
m_internalConnectionSet.insert(socket);
// Debug info
-
LogPedantic
(
- "Client started on interface:
" <<
- socket->GetLocalAddress().ToString());
+
WrtLogD
(
+ "Client started on interface:
%s",
+ socket->GetLocalAddress().ToString()
.c_str()
);
// Return unique identifier
return static_cast<AbstractRPCConnectionID>(socket);
// Return unique identifier
return static_cast<AbstractRPCConnectionID>(socket);
@@
-146,7
+146,7
@@
class GenericSocketRPCClient :
void Close(AbstractRPCConnectionID connectionID)
{
void Close(AbstractRPCConnectionID connectionID)
{
-
LogPedantic
("Closing client interface...");
+
WrtLogD
("Closing client interface...");
// Get socket from ID
SocketType *socket = static_cast<SocketType *>(connectionID);
// Get socket from ID
SocketType *socket = static_cast<SocketType *>(connectionID);
@@
-170,7
+170,7
@@
class GenericSocketRPCClient :
m_internalConnectionSet.erase(iterator);
// Done
m_internalConnectionSet.erase(iterator);
// Done
-
LogPedantic
("Closed");
+
WrtLogD
("Closed");
}
void CloseAll()
}
void CloseAll()