The output of modules being built in parallel is interleaved, fixes #78

This commit is contained in:
Guillaume Nodet
2020-10-01 10:22:18 +02:00
parent 1123c55497
commit 5135cb0928
2 changed files with 9 additions and 0 deletions

View File

@@ -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) {

View File

@@ -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) {