apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-24 13:15:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Improve terminal output

Browse Source 
* Say 'Looking for daemon...' straight ahead to elliminate the initial
  lag
* Present 'hidden' threads along with used/max threads instead of
  'n more'
* Print project name in bold even if no mojo is present in the line
* Be consistent about printing project artifactIds in bold also when
  lines are hidden
* The righ status line is present also when lines are hidden
This commit is contained in:
Peter Palaga
2020-10-28 23:55:08 +01:00
parent 1bb009127b
commit a9a3e907ee
5 changed files with 101 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/main/java/org/jboss/fuse/mvnd/client/DaemonConnector.java
View File

@@ -15,7 +15,6 @@
*/
package org.jboss.fuse.mvnd.client;
import java.io.File;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -30,7 +29,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.common.BuildProperties;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec;
@@ -45,6 +43,7 @@ import org.jboss.fuse.mvnd.common.DaemonStopEvent;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.MavenDaemon;
import org.jboss.fuse.mvnd.common.Os;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,10 +85,10 @@ public class DaemonConnector {
return null;
}
public DaemonClientConnection connect(DaemonCompatibilitySpec constraint, Consumer<String> logger) {
public DaemonClientConnection connect(DaemonCompatibilitySpec constraint, ClientOutput output) {
output.buildStatus("Looking up daemon...");
Map<Boolean, List<DaemonInfo>> idleBusy = registry.getAll().stream()
.collect(Collectors.groupingBy(di -> di.getState() == DaemonState.Idle));
final Collection<DaemonInfo> idleDaemons = idleBusy.getOrDefault(true, Collections.emptyList());
final Collection<DaemonInfo> busyDaemons = idleBusy.getOrDefault(false, Collections.emptyList());
@@ -107,7 +106,7 @@ public class DaemonConnector {
// No compatible daemons available - start a new daemon
String message = handleStopEvents(idleDaemons, busyDaemons);
logger.accept(message);
output.buildStatus(message);
return startDaemon(constraint);
}
@@ -151,11 +150,11 @@ public class DaemonConnector {
if (numStopped > 0) {
reasons.add(numStopped + " stopped");
}
return "Starting a Maven Daemon, "
+ String.join(" and ", reasons) + " Daemon" + (totalUnavailableDaemons > 1 ? "s" : "")
return "Starting new daemon, "
+ String.join(" and ", reasons) + " daemon" + (totalUnavailableDaemons > 1 ? "s" : "")
+ " could not be reused, use --status for details";
} else {
return "Starting a Maven Daemon (subsequent builds will be faster)";
return "Starting new daemon (subsequent builds will be faster)...";
}
}

3
client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
View File

@@ -202,8 +202,7 @@ public class DefaultClient implements Client {
final DaemonConnector connector = new DaemonConnector(layout, registry, buildProperties);
List<String> opts = new ArrayList<>();
try (DaemonClientConnection daemon = connector.connect(new DaemonCompatibilitySpec(javaHome, opts),
s -> output.accept(null, s))) {
try (DaemonClientConnection daemon = connector.connect(new DaemonCompatibilitySpec(javaHome, opts), output)) {
daemon.dispatch(new Message.BuildRequest(
args,