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

Use err stream when purging logs during a build, fixes #604 (#617)

Browse Source
This commit is contained in:
Guillaume Nodet
2022-04-13 10:39:26 +02:00
committed by GitHub
parent e8e5ffc4ee
commit eaf0ec3e4a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java
View File

@@ -210,14 +210,14 @@ public class DefaultClient implements Client {
try (DaemonRegistry registry = new DaemonRegistry(parameters.registry())) { try (DaemonRegistry registry = new DaemonRegistry(parameters.registry())) {
if (Environment.STATUS.removeCommandLineOption(args) != null) { if (Environment.STATUS.removeCommandLineOption(args) != null) {
final String template = "%8s %7s %24s %7s %5s %23s %s"; final String template = "%8s %7s %24s %7s %5s %23s %s";
output.accept(Message.log(String.format(template, output.accept(Message.out(String.format(template,
"ID", "PID", "Address", "Status", "RSS", "Last activity", "Java home"))); "ID", "PID", "Address", "Status", "RSS", "Last activity", "Java home")));
for (DaemonInfo d : registry.getAll()) { for (DaemonInfo d : registry.getAll()) {
if (ProcessHandle.of(d.getPid()).isEmpty()) { if (ProcessHandle.of(d.getPid()).isEmpty()) {
/* The process does not exist anymore - remove it from the registry */ /* The process does not exist anymore - remove it from the registry */
registry.remove(d.getId()); registry.remove(d.getId());
} else { } else {
output.accept(Message.log(String.format(template, output.accept(Message.out(String.format(template,
d.getId(), d.getPid(), d.getAddress(), d.getState(), d.getId(), d.getPid(), d.getAddress(), d.getState(),
OsUtils.kbTohumanReadable(OsUtils.findProcessRssInKb(d.getPid())), OsUtils.kbTohumanReadable(OsUtils.findProcessRssInKb(d.getPid())),
LocalDateTime.ofInstant( LocalDateTime.ofInstant(
@@ -231,7 +231,7 @@ public class DefaultClient implements Client {
if (Environment.STOP.removeCommandLineOption(args) != null) { if (Environment.STOP.removeCommandLineOption(args) != null) {
DaemonInfo[] dis = registry.getAll().toArray(new DaemonInfo[0]); DaemonInfo[] dis = registry.getAll().toArray(new DaemonInfo[0]);
if (dis.length > 0) { if (dis.length > 0) {
output.accept(Message.display("Stopping " + dis.length + " running daemons")); output.accept(Message.out("Stopping " + dis.length + " running daemons"));
for (DaemonInfo di : dis) { for (DaemonInfo di : dis) {
try { try {
ProcessHandle.of(di.getPid()).ifPresent(ProcessHandle::destroyForcibly); ProcessHandle.of(di.getPid()).ifPresent(ProcessHandle::destroyForcibly);
@@ -246,7 +246,7 @@ public class DefaultClient implements Client {
} }
if (Environment.PURGE.removeCommandLineOption(args) != null) { if (Environment.PURGE.removeCommandLineOption(args) != null) {
String result = purgeLogs(); String result = purgeLogs();
output.accept(Message.display(result != null ? result : "Nothing to purge")); output.accept(Message.out(result != null ? result : "Nothing to purge"));
return DefaultResult.success(argv); return DefaultResult.success(argv);
} }
@@ -327,7 +327,7 @@ public class DefaultClient implements Client {
} finally { } finally {
String msg = purgeMessage.get(); String msg = purgeMessage.get();
if (msg != null) { if (msg != null) {
output.accept(Message.display(msg)); output.accept(Message.err(msg));
} }
} }
} }