From 3d9df953d455e1b33e9fdd53bb692732a37b8a75 Mon Sep 17 00:00:00 2001
From: Jerry Lee <oldratlee@gmail.com>
Date: Wed, 1 Jan 2025 18:44:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20improve=20log=20message=20of=20swal?=
 =?UTF-8?q?lowed=20exceptions=20=F0=9F=A6=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cffu/eh/ExHandleOfMultiplyCfsUtils.java   |  6 +++++-
 .../cffu/internal/ExceptionLogger.java        | 19 +++++++++++--------
 scripts/integration_test                      |  8 ++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/cffu-core/src/main/java/io/foldright/cffu/eh/ExHandleOfMultiplyCfsUtils.java b/cffu-core/src/main/java/io/foldright/cffu/eh/ExHandleOfMultiplyCfsUtils.java
index 28274cce..82e0f4b7 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/eh/ExHandleOfMultiplyCfsUtils.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/eh/ExHandleOfMultiplyCfsUtils.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.CompletionStage;
 
 import static io.foldright.cffu.CompletableFutureUtils.unwrapCfException;
+import static io.foldright.cffu.internal.ExceptionLogger.logException;
 import static io.foldright.cffu.internal.ExceptionLogger.logUncaughtException;
 
 
@@ -79,7 +80,10 @@ public static ExceptionHandler cffuExHandler() {
         return CFFU_EX_HANDLER;
     }
 
-    private static final ExceptionHandler CFFU_EX_HANDLER = exInfo -> logUncaughtException(exInfo.where, exInfo.ex);
+    private static final ExceptionHandler CFFU_EX_HANDLER = exInfo -> {
+        String msg = "Swallowed exception of cf" + (exInfo.index + 1) + " at " + exInfo.where;
+        logException(msg, exInfo.ex);
+    };
 
     /**
      * Creates new CompletionStages that only capture exception results from the input CompletionStages,
diff --git a/cffu-core/src/main/java/io/foldright/cffu/internal/ExceptionLogger.java b/cffu-core/src/main/java/io/foldright/cffu/internal/ExceptionLogger.java
index 543f4069..691b4a98 100644
--- a/cffu-core/src/main/java/io/foldright/cffu/internal/ExceptionLogger.java
+++ b/cffu-core/src/main/java/io/foldright/cffu/internal/ExceptionLogger.java
@@ -9,7 +9,7 @@
  * <strong>Internal</strong> exception logging utility for the cffu library.
  * <p>
  * By default, uncaught exceptions are logged with their complete stack traces. The logging behavior can be configured
- * through the system property {@code cffu.uncaught.exception.log.format} with the following values:
+ * through the system property {@code cffu.exception.log.format} with the following values:
  * <ul>
  * <li>{@code full}: Log the complete exception stack trace (default)</li>
  * <li>{@code short}: Log only the exception message</li>
@@ -18,8 +18,8 @@
  * <p>
  * Configure the logging format by either:
  * <ul>
- * <li>Setting the JVM argument {@code -Dcffu.uncaught.exception.log.format=<value>} at startup</li>
- * <li>Calling {@code System.setProperty("cffu.uncaught.exception.log.format", "<value>")} programmatically</li>
+ * <li>Setting the JVM argument {@code -Dcffu.exception.log.format=<value>} at startup</li>
+ * <li>Calling {@code System.setProperty("cffu.exception.log.format", "<value>")} programmatically</li>
  * </ul>
  *
  * @author HuHao (995483610 at qq dot com)
@@ -33,22 +33,25 @@ public final class ExceptionLogger {
     private static final LoggerAdapter logger = getLogger();
 
     @SuppressWarnings("StatementWithEmptyBody")
-    public static void logUncaughtException(String where, Throwable ex) {
+    public static void logException(String msg, Throwable ex) {
         final String fullFormat = "full";
         final String shortFormat = "short";
         final String noneFormat = "none";
 
-        final String format = System.getProperty("cffu.uncaught.exception.log.format", fullFormat);
-        final String msgHead = "Uncaught exception occurred at ";
+        final String format = System.getProperty("cffu.exception.log.format", fullFormat);
         if (noneFormat.equalsIgnoreCase(format)) {
             // pass silently when explicitly silenced.
         } else if (shortFormat.equalsIgnoreCase(format)) {
-            logger.error(msgHead + where + ", " + ex, null);
+            logger.error(msg + ", " + ex, null);
         } else {
-            logger.error(msgHead + where, ex);
+            logger.error(msg, ex);
         }
     }
 
+    public static void logUncaughtException(String where, Throwable ex) {
+        logException("Uncaught exception occurred at " + where, ex);
+    }
+
     /**
      * Returns a logger adapter that uses {@code SLF4J} if available, otherwise uses {@link java.util.logging}.
      */
diff --git a/scripts/integration_test b/scripts/integration_test
index bace4479..8b177dd3 100755
--- a/scripts/integration_test
+++ b/scripts/integration_test
@@ -65,23 +65,23 @@ mvu::mvn_cmd clean install
 readonly MVN_OPTS_FOR_JAVA8=(
   -Dkotlin.version=1.6.0 -Dguava.version=29.0-jre
   -P!default-logging-dependencies -P!default-arch-unit-test
-  -Dcffu.uncaught.exception.log.format=short
+  -Dcffu.exception.log.format=short
 )
 # shellcheck disable=SC2034
 readonly MVN_OPTS_FOR_JAVA11=(
   -Dkotlin.version=1.7.0
   -DswitchToLog4j2LoggingDependencies -Pswitch-slf4j-to-v1
-  -Dcffu.uncaught.exception.log.format=short
+  -Dcffu.exception.log.format=short
 )
 # shellcheck disable=SC2034
 readonly MVN_OPTS_FOR_JAVA17=(
   -Dkotlin.version=1.8.0
-  -DswitchToLog4j2LoggingDependencies -Dcffu.uncaught.exception.log.format=short
+  -DswitchToLog4j2LoggingDependencies -Dcffu.exception.log.format=short
 )
 # shellcheck disable=SC2034
 readonly MVN_OPTS_FOR_JAVA23=(
   -Dkotlin.version=1.9.0
-  -Dcffu.uncaught.exception.log.format=none
+  -Dcffu.exception.log.format=none
 )
 
 SUREFIRE_TEST_GOAL=(surefire:test)