From a83cd474affc63e1e27d01bc77ca637bff95b508 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sat, 1 Apr 2023 13:01:35 +0200 Subject: [PATCH] Change RPC logging format for rpc.RPC_CALL: From: [rpc] Client RPC:adminpanel (Syzop): RPC call channel.set_mode: channel='#test', modes='+b', parameters='some!silly@ban' To: [rpc] RPC call channel.set_mode by RPC:adminpanel (Syzop): channel='#test', modes='+b', parameters='some!silly@ban' This so the most important information is shown first (generally a good principle :D) --- src/modules/rpc/rpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/rpc/rpc.c b/src/modules/rpc/rpc.c index 95b42ad19..1690b9893 100644 --- a/src/modules/rpc/rpc.c +++ b/src/modules/rpc/rpc.c @@ -770,13 +770,13 @@ void rpc_call_log(Client *client, RPCHandler *handler, json_t *request, const ch if (*params_string) { unreal_log(handler->loglevel, "rpc", "RPC_CALL", client, - "[rpc] Client $client ($issuer): RPC call $method: $params_string", + "[rpc] RPC call $method by $client ($issuer): $params_string", log_data_string("issuer", client->rpc->issuer), log_data_string("method", method), log_data_string("params_string", params_string)); } else { unreal_log(handler->loglevel, "rpc", "RPC_CALL", client, - "[rpc] Client $client ($issuer): RPC call $method", + "[rpc] RPC call $method by $client ($issuer)", log_data_string("issuer", client->rpc->issuer), log_data_string("method", method)); } @@ -784,12 +784,12 @@ void rpc_call_log(Client *client, RPCHandler *handler, json_t *request, const ch if (*params_string) { unreal_log(handler->loglevel, "rpc", "RPC_CALL", client, - "[rpc] Client $client: RPC call $method: $params_string", + "[rpc] RPC call $method by $client: $params_string", log_data_string("method", method), log_data_string("params_string", params_string)); } else { unreal_log(handler->loglevel, "rpc", "RPC_CALL", client, - "[rpc] Client $client: RPC call $method", + "[rpc] RPC call $method by $client", log_data_string("method", method)); } }