port InterruptedException fix to jda5

Scarsz · Jul 7, 2024 · ca9a02e · ca9a02e
1 parent e95b4bf
commit ca9a02e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/jda5/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java b/jda5/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java
@@ -249,7 +249,7 @@ private Message updateMessage() throws IllegalStateException {
                 }
             } catch (InterruptedException e) {
                 JDA.Status status = channel.getJDA().getStatus();
-                if (status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
+                if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
                     // ignored, no-op
                     return currentMessage;
                 } else {
@@ -264,7 +264,7 @@ private Message updateMessage() throws IllegalStateException {
             throw new RuntimeException(e);
         } catch (InterruptedException e) {
             JDA.Status status = channel.getJDA().getStatus();
-            if (status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
+            if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
                 // ignored, no-op
                 return currentMessage;
             } else {
@@ -302,11 +302,16 @@ public void recreateChannel(@Nullable String reason) {
      */
     public void shutdownExecutor() {
         if (scheduledFuture != null) {
-            scheduledFuture.cancel(true);
+            scheduledFuture.cancel(false);
             scheduledFuture = null;
         }
         if (executor != null) {
             executor.shutdown();
+            try {
+                executor.awaitTermination(5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                // ignore, it's fine if the last tidbit of console output doesn't get sent
+            }
             executor = null;
         }
     }