feat: report exception info of hop handle, errors should never pass s…

…ilently 💣 👀
foldright · Jun 4, 2024 · 6fde227 · 6fde227
1 parent f766108
commit 6fde227
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java b/cffu-core/src/main/java/io/foldright/cffu/CompletableFutureUtils.java
@@ -1271,7 +1271,7 @@ C peek(C cf, BiConsumer<? super T, ? super Throwable> action) {
         requireNonNull(cf, "cf is null");
         requireNonNull(action, "action is null");
 
-        cf.whenComplete(action).exceptionally(CompletableFutureUtils::reportExceptionInfoOfPeekAction);
+        cf.whenComplete(action).exceptionally(ex -> reportException("Exception occurred in the action of peek:", ex));
         return cf;
     }
 
@@ -1321,16 +1321,17 @@ C peekAsync(C cf, BiConsumer<? super T, ? super Throwable> action, Executor exec
         requireNonNull(action, "action is null");
         requireNonNull(executor, "executor is null");
 
-        cf.whenCompleteAsync(action, executor).exceptionally(CompletableFutureUtils::reportExceptionInfoOfPeekAction);
+        cf.whenCompleteAsync(action, executor).exceptionally(ex ->
+                reportException("Exception occurred in the action of peekAsync:", ex));
         return cf;
     }
 
     @Nullable
-    private static <T> T reportExceptionInfoOfPeekAction(Throwable ex) {
+    private static <T> T reportException(String msg, Throwable ex) {
         StringWriter sw = new StringWriter(4096);
         PrintWriter writer = new PrintWriter(sw);
 
-        writer.println("Exception occurred in the action of peek:");
+        writer.println(msg);
         ex.printStackTrace(writer);
 
         System.err.println(sw);
@@ -1642,14 +1643,20 @@ private static <C extends CompletableFuture<?>> C hopExecutorIfAtCfDelayerThread
             if (!atCfDelayerThread()) completeCf(ret, v, ex);
             else delayedExecutor(0, TimeUnit.SECONDS, asyncExecutor)
                     .execute(() -> completeCf(ret, v, ex));
-        });
+        }).exceptionally(ex -> reportException("Exception occurred in the input cf whenComplete of hop executor:", ex));
 
         return (C) ret;
     }
 
     private static void completeCf(CompletableFuture<Object> cf, Object value, @Nullable Throwable ex) {
-        if (ex == null) cf.complete(value);
-        else cf.completeExceptionally(ex);
+        try {
+            if (ex == null) cf.complete(value);
+            else cf.completeExceptionally(ex);
+        } catch (Throwable t) {
+            if (ex != null) t.addSuppressed(ex);
+            reportException("Exception occurred in completeCf:", t);
+            throw t; // rethrow exception, report to caller
+        }
     }
 
     //# Advanced methods of CompletionStage