Merge pull request #26 from Dinty1/develop

Extra exception handling to catch interrupted errors
Scarsz · Jul 31, 2024 · f446284 · f446284
2 parents ab1464b + 3fc74e1
commit f446284
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 39 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/common/src/main/java/me/scarsz/jdaappender/IChannelLoggingHandler.java b/common/src/main/java/me/scarsz/jdaappender/IChannelLoggingHandler.java
@@ -1,5 +1,6 @@
 package me.scarsz.jdaappender;
 
+import java.io.InterruptedIOException;
 import java.util.concurrent.ScheduledFuture;
 
 public interface IChannelLoggingHandler {
@@ -12,4 +13,12 @@ public interface IChannelLoggingHandler {
 
     ScheduledFuture<?> getScheduledFuture();
 
+    default boolean isInterruptedException(Exception e) {
+        Throwable ex = e;
+        while (ex != null) {
+            if (ex instanceof InterruptedIOException || ex instanceof InterruptedException) return true;
+            ex = ex.getCause();
+        }
+        return false;
+    }
 }
diff --git a/jda4/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java b/jda4/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java
@@ -239,37 +239,23 @@ private Message updateMessage() throws IllegalStateException {
         if (currentMessage != null) {
             try {
                 return currentMessage.editMessage(full).submit().get();
-            } catch (ExecutionException e) {
+            } catch (Exception e) {
+                if (this.isInterruptedException(e)) return currentMessage;
                 Throwable cause = e.getCause();
                 if (cause instanceof ErrorResponseException
                         && ((ErrorResponseException) cause).getErrorResponse() == ErrorResponse.UNKNOWN_MESSAGE) {
                     currentMessage = null;
                 } else {
-                    throw new RuntimeException(cause);
-                }
-            } catch (InterruptedException e) {
-                JDA.Status status = channel.getJDA().getStatus();
-                if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
-                    // ignored, no-op
-                    return currentMessage;
-                } else {
-                    throw new RuntimeException(e);
+                    throw new RuntimeException(e.getCause());
                 }
             }
         }
 
         try {
             return channel.sendMessage(full).submit().get();
-        } catch (ExecutionException e) {
+        } catch (Exception e) {
+            if (this.isInterruptedException(e)) return currentMessage;
             throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            JDA.Status status = channel.getJDA().getStatus();
-            if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
-                // ignored, no-op
-                return currentMessage;
-            } else {
-                throw new RuntimeException(e);
-            }
         }
     }
 

diff --git a/jda5/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java b/jda5/src/main/java/me/scarsz/jdaappender/ChannelLoggingHandler.java
@@ -239,37 +239,23 @@ private Message updateMessage() throws IllegalStateException {
         if (currentMessage != null) {
             try {
                 return currentMessage.editMessage(full).submit().get();
-            } catch (ExecutionException e) {
+            } catch (Exception e) {
+                if (this.isInterruptedException(e)) return currentMessage;
                 Throwable cause = e.getCause();
                 if (cause instanceof ErrorResponseException
                         && ((ErrorResponseException) cause).getErrorResponse() == ErrorResponse.UNKNOWN_MESSAGE) {
                     currentMessage = null;
                 } else {
                     throw new RuntimeException(cause);
                 }
-            } catch (InterruptedException e) {
-                JDA.Status status = channel.getJDA().getStatus();
-                if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
-                    // ignored, no-op
-                    return currentMessage;
-                } else {
-                    throw new RuntimeException(e);
-                }
             }
         }
 
         try {
             return channel.sendMessage(full).submit().get();
-        } catch (ExecutionException e) {
+        } catch (Exception e) {
+            if (this.isInterruptedException(e)) return currentMessage;
             throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            JDA.Status status = channel.getJDA().getStatus();
-            if (executor == null || executor.isShutdown() || status == JDA.Status.SHUTTING_DOWN || status == JDA.Status.SHUTDOWN) {
-                // ignored, no-op
-                return currentMessage;
-            } else {
-                throw new RuntimeException(e);
-            }
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.22</version>
+                <version>1.18.34</version>
                 <scope>provided</scope>
             </dependency>