apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-01-13 07:04:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix display showing more projects than the ones actually active

Browse Source
This commit is contained in:
Guillaume Nodet
2021-02-23 15:48:35 +01:00
parent 89a636fff4
commit eb1258f44e
4 changed files with 93 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
common/src/main/java/org/mvndaemon/mvnd/common/Message.java
View File

@@ -23,6 +23,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.UTFDataFormatException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -108,6 +109,51 @@ public abstract class Message {
final long timestamp = System.nanoTime();
public static Comparator<Message> getMessageComparator() {
return Comparator.comparingInt(Message::getClassOrder).thenComparingLong(Message::timestamp);
}
public static int getClassOrder(Message m) {
switch (m.getType()) {
case KEEP_ALIVE:
case BUILD_REQUEST:
return 0;
case BUILD_STARTED:
return 1;
case PROMPT:
case PROMPT_RESPONSE:
case DISPLAY:
return 2;
case PROJECT_STARTED:
return 3;
case MOJO_STARTED:
return 4;
case TRANSFER_INITIATED:
case TRANSFER_STARTED:
return 40;
case TRANSFER_PROGRESSED:
return 41;
case TRANSFER_CORRUPTED:
case TRANSFER_SUCCEEDED:
case TRANSFER_FAILED:
return 42;
case PROJECT_LOG_MESSAGE:
return 50;
case BUILD_LOG_MESSAGE:
return 51;
case PROJECT_STOPPED:
return 95;
case BUILD_FINISHED:
return 96;
case BUILD_EXCEPTION:
return 97;
case STOP:
return 99;
default:
throw new IllegalStateException("Unexpected message type " + m.getType() + ": " + m);
}
}
public long timestamp() {
return timestamp;
}

6
common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
View File

@@ -355,8 +355,10 @@ public class TerminalOutput implements ClientOutput {
}
case Message.PROJECT_LOG_MESSAGE: {
final ProjectEvent bm = (ProjectEvent) entry;
final Project prj = projects.computeIfAbsent(bm.getProjectId(), Project::new);
if (noBuffering || dumb) {
final Project prj = projects.get(bm.getProjectId());
if (prj == null) {
log.accept(bm.getMessage());
} else if (noBuffering || dumb) {
String msg;
if (maxThreads > 1) {
msg = String.format("[%s] %s", bm.getProjectId(), bm.getMessage());