More logging during unexpected error in ipc protocol

dzmipt · Oct 18, 2024 · e4a6cef · e4a6cef
1 parent 15f1a9c
commit e4a6cef
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/kx/KConnection.java b/src/kx/KConnection.java
@@ -257,7 +257,7 @@ public void run() {
             } catch (Throwable e) {
                 synchronized (lockRead) {
                     IOException io = e instanceof IOException ?
-                            (IOException) e : new IOException("Exception in message deserialization", e);
+                            (IOException) e : new InternalProtocolError("Exception in message deserialization", e);
                     message = new KMessage(io);
                     message.setFinished(K.KTimestamp.now());
                     lockRead.notifyAll();
@@ -266,4 +266,11 @@ public void run() {
             }
         }
     }
+
+    public static class InternalProtocolError extends IOException {
+        public InternalProtocolError(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
 }
diff --git a/src/studio/ui/action/QueryExecutor.java b/src/studio/ui/action/QueryExecutor.java
@@ -1,6 +1,7 @@
 package studio.ui.action;
 
 import kx.K4Exception;
+import kx.KConnection;
 import kx.KMessage;
 import kx.ProgressCallback;
 import org.apache.logging.log4j.LogManager;
@@ -135,11 +136,15 @@ protected QueryResult doInBackground() {
                 }
                 result.setError(e);
             }
-            if (result.getError() != null) {
-                if (result.getError() instanceof K4Exception) {
-                    queryLog.info("#{}: server returns error {}", queryIndex, result.getError().getMessage());
+            Throwable error = result.getError();
+            if (error != null) {
+                if (error instanceof K4Exception) {
+                    queryLog.info("#{}: server returns error {}", queryIndex, error.getMessage());
                 } else {
-                    queryLog.info("#{}: error during execution {} {}", queryIndex, result.getError().getClass().getName(), result.getError().getMessage());
+                    queryLog.info("#{}: error during execution {} {}", queryIndex, error.getClass().getName(), error.getMessage());
+                    if (error instanceof KConnection.InternalProtocolError) {
+                        log.error("Unexpected error during query execution", error);
+                    }
                 }
             } else {
                 if (queryTask.returnResult()) {