ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-06 01:11:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor: make the trace logging for the RPC server a bit more helpful.

Browse Source
This commit is contained in:
Mike Hearn 2018-08-22 00:01:45 +02:00
parent 785bae9e48
commit 409b4e2a42
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/src/main/kotlin/net/corda/node/services/messaging/RPCServer.kt
View File

@ -305,7 +305,18 @@ class RPCServer(
private fun clientArtemisMessageHandler(artemisMessage: ClientMessage) { private fun clientArtemisMessageHandler(artemisMessage: ClientMessage) {
lifeCycle.requireState(State.STARTED) lifeCycle.requireState(State.STARTED)
val clientToServer = RPCApi.ClientToServer.fromClientMessage(artemisMessage) val clientToServer = RPCApi.ClientToServer.fromClientMessage(artemisMessage)
log.debug { "-> RPC -> $clientToServer" } if (log.isDebugEnabled) {
when (clientToServer) {
is RPCApi.ClientToServer.RpcRequest -> {
val username = artemisMessage.getStringProperty("_AMQ_VALIDATED_USER") ?: "(unknown)"
// Don't print the whole object because most of the data is useless.
log.debug { "-> RPC by $username -> ${clientToServer.methodName}" }
}
is RPCApi.ClientToServer.ObservablesClosed -> {
log.debug { "-> RPC observable closed -> $clientToServer"}
}
}
}
try { try {
when (clientToServer) { when (clientToServer) {
is RPCApi.ClientToServer.RpcRequest -> { is RPCApi.ClientToServer.RpcRequest -> {
@ -349,12 +360,15 @@ class RPCServer(
return Try.on { return Try.on {
try { try {
CURRENT_RPC_CONTEXT.set(context) CURRENT_RPC_CONTEXT.set(context)
log.debug { "Calling $methodName" } log.trace { "Calling $methodName" }
val method = methodTable[methodName] ?: val method = methodTable[methodName] ?:
throw RPCException("Received RPC for unknown method $methodName - possible client/server version skew?") throw RPCException("Received RPC for unknown method $methodName - possible client/server version skew?")
method.invoke(ops, *arguments.toTypedArray()) method.invoke(ops, *arguments.toTypedArray())
} catch (e: InvocationTargetException) { } catch (e: InvocationTargetException) {
throw e.cause ?: RPCException("Caught InvocationTargetException without cause") throw e.cause ?: RPCException("Caught InvocationTargetException without cause")
} catch (e: Exception) {
log.warn("Caught exception attempting to invoke RPC $methodName", e)
throw e
} finally { } finally {
CURRENT_RPC_CONTEXT.remove() CURRENT_RPC_CONTEXT.remove()
} }