From 7cc0ef1c70f02629659da970528bca4c04986bb8 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 8 Sep 2024 08:30:31 +0200 Subject: [PATCH] Improve error message and log output for failed jsonrpc commands --- .../signal/jsonrpc/SignalJsonRpcCommandHandler.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java index 3609163c..96456a4e 100644 --- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java +++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java @@ -229,15 +229,17 @@ public class SignalJsonRpcCommandHandler { case RateLimitErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(RATELIMIT_ERROR, e.getMessage(), getErrorDataNode(objectMapper, result))); - case UnexpectedErrorException e -> - throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR, - e.getMessage(), - getErrorDataNode(objectMapper, result))); + case UnexpectedErrorException e -> { + logger.error("Command execution failed with unexpected error", e); + throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR, + e.getMessage() + " (" + e.getClass().getSimpleName() + ")", + getErrorDataNode(objectMapper, result))); + } } } catch (Throwable e) { logger.error("Command execution failed", e); throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR, - e.getMessage(), + e.getMessage() + " (" + e.getClass().getSimpleName() + ")", getErrorDataNode(objectMapper, result))); } -- 2.50.1