Merge remote-tracking branch 'origin/master'

yvasyliev · Mar 6, 2024 · d2d33f4 · d2d33f4
2 parents 78fda56 + e23b74b
commit d2d33f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.github.yvasyliev</groupId>
     <artifactId>reddit-telegram-forwarder</artifactId>
-    <version>3.2.1</version>
+    <version>3.2.3</version>
 
     <properties>
         <java.version>21</java.version>
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.45.0.0</version>
+            <version>3.45.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-community-dialects</artifactId>
-            <version>6.4.2.Final</version>
+            <version>6.4.4.Final</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/src/main/java/com/github/yvasyliev/appenders/TelegramBotAppender.java b/src/main/java/com/github/yvasyliev/appenders/TelegramBotAppender.java
@@ -20,6 +20,7 @@
 import java.io.StringWriter;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
 
 @Plugin(name = "TelegramBotAppender", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE)
 public class TelegramBotAppender extends AbstractAppender {
@@ -45,7 +46,9 @@ public static TelegramBotAppender createAppender(
 
     @Override
     public void append(LogEvent event) {
-        var thrown = event.getThrown();
+        var thrown = event.getThrown() instanceof ExecutionException executionException
+                ? executionException.getCause()
+                : event.getThrown();
         if (thrown == null || !ignoredExceptions.contains(thrown.getClass())) {
             RedditTelegramForwarderApplication.withContext(applicationContext -> {
                 try {

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -26,6 +26,7 @@
             <IgnoredExceptions>
                 <IgnoredException>org.apache.http.NoHttpResponseException</IgnoredException>
                 <IgnoredException>java.net.http.HttpConnectTimeoutException</IgnoredException>
+                <IgnoredException>java.net.ConnectException</IgnoredException>
             </IgnoredExceptions>
         </TelegramBotAppender>
     </Appenders>