Improve error message and log output for failed jsonrpc commands

[signal-cli] / src / main / java / org / asamk / signal / jsonrpc / JsonRpcReader.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index f9ef71a1f05cbc8ca72cba4ee90ab88786d5eeba..84805e10d84d404b2b044df22d911ddc70f477bb 100644 (file)
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 
 
 public class JsonRpcReader {
 

-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);

 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;
 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;


@@ -55,8 +55,7 @@ public class JsonRpcReader {
             return;
         }
 
             return;
         }
 

-        final var executor = Executors.newFixedThreadPool(10);
-        try {
+        try (final var executor = Executors.newCachedThreadPool()) {

             while (!Thread.interrupted()) {
                 final var input = lineSupplier.get();
                 if (input == null) {
             while (!Thread.interrupted()) {
                 final var input = lineSupplier.get();
                 if (input == null) {


@@ -72,8 +71,6 @@ public class JsonRpcReader {
 
                 executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
             }
 
                 executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
             }

-        } finally {
-            Util.closeExecutorService(executor);

         }
     }
 
         }
     }
 


@@ -94,8 +91,7 @@ public class JsonRpcReader {
             case JsonRpcBatchMessage jsonRpcBatchMessage -> {
                 final var messages = jsonRpcBatchMessage.getMessages();
                 final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
             case JsonRpcBatchMessage jsonRpcBatchMessage -> {
                 final var messages = jsonRpcBatchMessage.getMessages();
                 final var responseList = new ArrayList<JsonRpcResponse>(messages.size());

-                final var executor = Executors.newFixedThreadPool(10);
-                try {
+                try (final var executor = Executors.newCachedThreadPool()) {

                     final var lock = new ReentrantLock();
                     messages.forEach(jsonNode -> {
                         final JsonRpcRequest request;
                     final var lock = new ReentrantLock();
                     messages.forEach(jsonNode -> {
                         final JsonRpcRequest request;


@@ -124,8 +120,6 @@ public class JsonRpcReader {
                             }
                         });
                     });
                             }
                         });
                     });

-                } finally {
-                    Util.closeExecutorService(executor);

                 }
 
                 if (!responseList.isEmpty()) {
                 }
 
                 if (!responseList.isEmpty()) {