Killed or crashed daemon process kept in the registry until mvnd --st…

…op is called #154
apache · Oct 27, 2020 · 6cbd5be · 6cbd5be
1 parent 59a9bba
commit 6cbd5be
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -154,13 +154,20 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
                 final String template = "    %36s  %7s  %5s  %7s  %5s  %23s  %s";
                 output.accept(null, String.format(template,
                         "UUID", "PID", "Port", "Status", "RSS", "Last activity", "Java home"));
-                registry.getAll().forEach(d -> output.accept(null, String.format(template,
-                        d.getUid(), d.getPid(), d.getAddress(), d.getState(),
-                        OsUtils.kbTohumanReadable(OsUtils.findProcessRssInKb(d.getPid())),
-                        LocalDateTime.ofInstant(
-                                Instant.ofEpochMilli(Math.max(d.getLastIdle(), d.getLastBusy())),
-                                ZoneId.systemDefault()),
-                        d.getJavaHome())));
+                for (DaemonInfo d : registry.getAll()) {
+                    if (ProcessHandle.of(d.getPid()).isEmpty()) {
+                        /* The process does not exist anymore - remove it from the registry */
+                        registry.remove(d.getUid());
+                    } else {
+                        output.accept(null, String.format(template,
+                                d.getUid(), d.getPid(), d.getAddress(), d.getState(),
+                                OsUtils.kbTohumanReadable(OsUtils.findProcessRssInKb(d.getPid())),
+                                LocalDateTime.ofInstant(
+                                        Instant.ofEpochMilli(Math.max(d.getLastIdle(), d.getLastBusy())),
+                                        ZoneId.systemDefault()),
+                                d.getJavaHome()));
+                    }
+                }
                 return new DefaultResult(argv, null);
             }
             boolean stop = args.remove("--stop");