From 5135cb0928059c0785d2a55a42a6fb3cfeddf4cb Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 1 Oct 2020 10:22:18 +0200
Subject: [PATCH] The output of modules being built in parallel is interleaved,
 fixes #78

---
 daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java  | 4 ++++
 .../jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
index 824f545a..28389152 100644
--- a/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
+++ b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
@@ -525,22 +525,26 @@ public class Server implements AutoCloseable, Runnable {
 
         @Override
         protected void onStartProject(ProjectBuild project) {
+            super.onStartProject(project);
             sendEvent(Type.ProjectStarted, project);
         }
 
         @Override
         protected void onStopProject(ProjectBuild project) {
             sendEvent(Type.ProjectStopped, project);
+            super.onStopProject(project);
         }
 
         @Override
         protected void onStartMojo(ProjectBuild project) {
+            super.onStartMojo(project);
             sendEvent(Type.MojoStarted, project);
         }
 
         @Override
         protected void onStopMojo(ProjectBuild project) {
             sendEvent(Type.MojoStopped, project);
+            super.onStopMojo(project);
         }
 
         private void sendEvent(Type type, ProjectBuild project) {
diff --git a/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java
index d9873481..8cfa71a0 100644
--- a/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java
+++ b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java
@@ -24,6 +24,9 @@ import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.project.MavenProject;
 import org.jline.utils.AttributedString;
+import org.slf4j.MDC;
+
+import static org.jboss.fuse.mvnd.logging.smart.ProjectBuildLogAppender.KEY_PROJECT_ID;
 
 public abstract class AbstractLoggingSpy extends AbstractEventSpy {
 
@@ -104,6 +107,7 @@ public abstract class AbstractLoggingSpy extends AbstractEventSpy {
     }
 
     protected void onStartProject(ProjectBuild project) {
+        MDC.put(KEY_PROJECT_ID, project.project.getId());
         update();
     }
 
@@ -117,6 +121,7 @@ public abstract class AbstractLoggingSpy extends AbstractEventSpy {
 
     protected void onStopProject(ProjectBuild project) {
         update();
+        MDC.put(KEY_PROJECT_ID, project.project.getId());
     }
 
     protected synchronized void notifyMojoExecutionStart(ExecutionEvent event) {