[SDCISA-16293] resolve merge conflict with develop.

hiddenalpha · Jun 24, 2024 · fca2bc4 · fca2bc4
2 parents 3578782 + 262216a
commit fca2bc4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/org/swisspush/redisques/scheduling/PeriodicSkipScheduler.java b/src/main/java/org/swisspush/redisques/scheduling/PeriodicSkipScheduler.java
@@ -53,7 +53,16 @@ private void onTrigger(Timer timer) {
         var fut = p.future();
         fut.onSuccess((Void v) -> timer.onTaskDone_());
         fut.onFailure(ex -> log.error("This is expected to be UNREACHABLE ({})", timer.dbgHint, ex));
-        timer.task.accept(p::complete);
+        try {
+            timer.task.accept(p::complete);
+        } catch (Exception ex) {
+            if (log.isDebugEnabled()) {
+                log.debug("Task has failed ({})", timer.dbgHint, ex);
+            } else {
+                log.info("Task has failed ({}): {}", timer.dbgHint, ex.getMessage());
+            }
+            p.tryComplete();
+        }
     }
 
     private void onTaskDone(Timer timer) {