X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/699b21f066eb3a0c5c21b58ccb79276cc3d296c9..7cc0ef1c70f02629659da970528bca4c04986bb8:/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 62556725..96456a4e 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -32,7 +32,7 @@ import java.util.function.Function;
 
 public class SignalJsonRpcCommandHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
 
     private static final int USER_ERROR = -1;
     private static final int IO_ERROR = -3;
@@ -94,7 +94,7 @@ public class SignalJsonRpcCommandHandler {
             if (manager == null) {
                 final var managers = c.getManagers();
                 if (managers.size() == 1) {
-                    manager = managers.get(0);
+                    manager = managers.getFirst();
                 }
             }
             if (manager != null) {
@@ -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)));
         }