Only prefix program output with thread name when Maven is running wit…

…h multiple threads. (#157)
mojohaus · Nov 10, 2023 · 6fcb15b · 6fcb15b
1 parent 584c544
commit 6fcb15b
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/main/java/org/codehaus/mojo/exec/ExecMojo.java b/src/main/java/org/codehaus/mojo/exec/ExecMojo.java
@@ -452,8 +452,11 @@ else if ( !StringUtils.isEmpty( argsProp ) )
                 else if (useMavenLogger)
                 {
                     getLog().debug("Will redirect program output to Maven logger");
-                    final String parentThreadName = Thread.currentThread().getName();
-                    final String logSuffix = "[" + parentThreadName + "] ";
+                    // If running parallel, append the projects original (i.e. current) thread name to the program
+                    // output as a log prefix, to enable easy tracing of program output when intermixed with other
+                    // Maven log output. NOTE: The accept(..) methods are running in PumpStreamHandler thread,
+                    // which is why we capture the thread name prefix here.
+                    final String logPrefix = session.isParallel() ? "[" + Thread.currentThread().getName() + "] " : "";
                     Consumer<String> mavenOutRedirect = new Consumer<String>()
                     {
 
@@ -462,11 +465,11 @@ public void accept(String logMessage)
                         {
                             if (quietLogs)
                             {
-                                getLog().debug(logSuffix + logMessage);
+                                getLog().debug(logPrefix + logMessage);
                             }
                             else
                             {
-                                getLog().info(logSuffix + logMessage);
+                                getLog().info(logPrefix + logMessage);
                             }
                         }
                     };
@@ -476,7 +479,7 @@ public void accept(String logMessage)
                         @Override
                         public void accept(String logMessage)
                         {
-                            getLog().error(logSuffix + logMessage);
+                            getLog().error(logPrefix + logMessage);
                         }
                     };