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

Improve progress display, fixes #112

Browse Source
This commit is contained in:
Guillaume Nodet
2020-10-20 11:14:15 +02:00
parent a735fac8e9
commit 844c54b62d
6 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java
View File

@@ -16,6 +16,7 @@
package org.jboss.fuse.mvnd.daemon;
import java.io.IOException;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
import java.nio.channels.ServerSocketChannel;
@@ -27,6 +28,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executors;
import java.util.concurrent.PriorityBlockingQueue;
@@ -38,6 +40,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.maven.cli.CliRequest;
import org.apache.maven.cli.CliRequestBuilder;
import org.apache.maven.cli.DaemonMavenCli;
import org.apache.maven.execution.MavenSession;
import org.jboss.fuse.mvnd.common.DaemonConnection;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.common.DaemonExpirationStatus;
@@ -527,8 +530,17 @@ public class Server implements AutoCloseable, Runnable {
}
@Override
protected void onStartSession() {
queue.add(new BuildEvent(Type.BuildStarted, "", ""));
protected void onStartSession(MavenSession session) {
Properties props = new Properties();
props.setProperty("projects", Integer.toString(session.getAllProjects().size()));
props.setProperty("cores", Integer.toString(session.getRequest().getDegreeOfConcurrency()));
StringWriter sw = new StringWriter();
try {
props.store(sw, null);
} catch (IOException e) {
throw new IllegalStateException(e);
}
queue.add(new BuildEvent(Type.BuildStarted, session.getTopLevelProject().getName(), sw.toString()));
}
@Override

5
daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java
View File

@@ -16,6 +16,7 @@
package org.jboss.fuse.mvnd.logging.smart;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;
public abstract class AbstractLoggingSpy {
@@ -43,7 +44,7 @@ public abstract class AbstractLoggingSpy {
}
protected void notifySessionStart(ExecutionEvent event) {
onStartSession();
onStartSession(event.getSession());
}
protected void notifySessionFinish(ExecutionEvent event) {
@@ -66,7 +67,7 @@ public abstract class AbstractLoggingSpy {
onStopMojo(getProjectId(event), getProjectDisplay(event));
}
protected void onStartSession() {
protected void onStartSession(MavenSession session) {
}
protected void onFinishSession() {

7
daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java
View File

@@ -16,6 +16,7 @@
package org.jboss.fuse.mvnd.logging.smart;
import java.io.IOError;
import org.apache.maven.execution.MavenSession;
import org.jboss.fuse.mvnd.common.logging.TerminalOutput;
public class MavenLoggingSpy extends AbstractLoggingSpy {
@@ -26,9 +27,13 @@ public class MavenLoggingSpy extends AbstractLoggingSpy {
}
@Override
protected void onStartSession() {
protected void onStartSession(MavenSession session) {
try {
output = new TerminalOutput(null);
output.startBuild(
session.getTopLevelProject().getName(),
session.getAllProjects().size(),
session.getRequest().getDegreeOfConcurrency());
} catch (Exception e) {
throw new IOError(e);
}