Backports

client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java

@@ -405,6 +405,12 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
                 address = host + ":" + iPort;
                 output.accept(Message.buildStatus("Daemon listening for debugger on address: " + address));
                 args.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=" + address);
+                if (Environment.MVND_KEEP_ALIVE.getCommandLineOption(args) == null) {
+                    System.setProperty(Environment.MVND_KEEP_ALIVE.getProperty(), "1h");
+                }
+                if (Environment.MVND_CONNECT_TIMEOUT.getCommandLineOption(args) == null) {
+                    System.setProperty(Environment.MVND_CONNECT_TIMEOUT.getProperty(), "1h");
+                }
             }
             // jvm args
             String jvmArgs = parameters.jvmArgs();

common/src/main/java/org/mvndaemon/mvnd/common/Environment.java

@@ -588,7 +588,18 @@ public enum Color {
         auto;
 
         public static Optional<Color> of(String color) {
-            return color == null ? Optional.empty() : Optional.of(Color.valueOf(color));
+            if (color == null) {
+                return Optional.empty();
+            } else if ("always".equals(color) || "yes".equals(color) || "force".equals(color)) {
+                return Optional.of(Color.always);
+            } else if ("never".equals(color) || "no".equals(color) || "none".equals(color)) {
+                return Optional.of(Color.never);
+            } else if ("auto".equals(color) || "tty".equals(color) || "if-tty".equals(color)) {
+                return Optional.of(Color.auto);
+            } else {
+                throw new IllegalArgumentException(
+                        "Invalid color configuration value '" + color + "'. Supported are 'auto', 'always', 'never'.");
+            }
         }
     }
 

common/src/main/java/org/mvndaemon/mvnd/common/Message.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class Message {
     public static final int BUILD_REQUEST = 1;
@@ -125,10 +126,13 @@ public static Message read(DataInputStream input) throws IOException {
         throw new IllegalStateException("Unexpected message type: " + type);
     }
 
+    private static final AtomicLong sequence = new AtomicLong();
+
+    final long seq = sequence.incrementAndGet();
     final long timestamp = System.nanoTime();
 
     public static Comparator<Message> getMessageComparator() {
-        return Comparator.comparingInt(Message::getClassOrder).thenComparingLong(Message::timestamp);
+        return Comparator.comparingInt(Message::getClassOrder).thenComparingLong(Message::seq);
     }
 
     public static int getClassOrder(Message m) {
@@ -178,6 +182,10 @@ public static int getClassOrder(Message m) {
         }
     }
 
+    public long seq() {
+        return seq;
+    }
+
     public long timestamp() {
         return timestamp;
     }
@@ -367,8 +375,7 @@ public String toString() {
             return "BuildRequest{" + "args="
                     + args + ", workingDir='"
                     + workingDir + '\'' + ", projectDir='"
-                    + projectDir + '\'' + ", env='"
-                    + env + '\'' + '}';
+                    + projectDir + '\'' + '}';
         }
 
         @Override

daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java

@@ -283,9 +283,16 @@ private void client(SocketChannel socket) {
                 updateState(DaemonState.Idle);
                 return;
             }
-            LOGGER.info("Request received: {}", message);
             if (message instanceof BuildRequest) {
-                handle(connection, (BuildRequest) message);
+                BuildRequest buildRequest = (BuildRequest) message;
+                LOGGER.info("Request received: {}", message);
+                if (Boolean.getBoolean("mvnd.dump.client.env")) {
+                    // Environment can contain passwords or tokens, so do not dump, unless specifically asked for
+                    LOGGER.trace("Client environment dump: {}", buildRequest.getEnv());
+                }
+                handle(connection, buildRequest);
+            } else {
+                LOGGER.info("Ignoring message: {}", message);
             }
         } catch (Throwable t) {
             LOGGER.error("Error reading request", t);