From 227652d2ccbf6271633798c7ab8c016586712679 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Thu, 8 Dec 2022 13:24:28 -0600 Subject: [PATCH] Safely close autocomplete streams on the server to avoid logspam Fixes #3162 --- .../io/deephaven/server/console/ConsoleServiceGrpcImpl.java | 4 +--- .../server/console/completer/JavaAutoCompleteObserver.java | 4 +--- .../server/console/completer/PythonAutoCompleteObserver.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java index 50df007da38..d6393c7bc5c 100644 --- a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java +++ b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java @@ -302,9 +302,7 @@ public void onError(Throwable t) { @Override public void onCompleted() { // just hang up too, browser will reconnect if interested - synchronized (responseObserver) { - responseObserver.onCompleted(); - } + safelyExecuteLocked(responseObserver, responseObserver::onCompleted); } } diff --git a/server/src/main/java/io/deephaven/server/console/completer/JavaAutoCompleteObserver.java b/server/src/main/java/io/deephaven/server/console/completer/JavaAutoCompleteObserver.java index 831f583e2f9..8cb4933f849 100644 --- a/server/src/main/java/io/deephaven/server/console/completer/JavaAutoCompleteObserver.java +++ b/server/src/main/java/io/deephaven/server/console/completer/JavaAutoCompleteObserver.java @@ -167,8 +167,6 @@ public void onError(Throwable t) { @Override public void onCompleted() { // just hang up too, browser will reconnect if interested - synchronized (responseObserver) { - responseObserver.onCompleted(); - } + safelyExecuteLocked(responseObserver, responseObserver::onCompleted); } } diff --git a/server/src/main/java/io/deephaven/server/console/completer/PythonAutoCompleteObserver.java b/server/src/main/java/io/deephaven/server/console/completer/PythonAutoCompleteObserver.java index e779418ab37..99068db893a 100644 --- a/server/src/main/java/io/deephaven/server/console/completer/PythonAutoCompleteObserver.java +++ b/server/src/main/java/io/deephaven/server/console/completer/PythonAutoCompleteObserver.java @@ -232,8 +232,6 @@ public void onError(Throwable t) { @Override public void onCompleted() { // just hang up too, browser will reconnect if interested - synchronized (responseObserver) { - responseObserver.onCompleted(); - } + safelyExecuteLocked(responseObserver, responseObserver::onCompleted); } }