You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/11/26 09:02:20 UTC
(maven-mvnd) branch mvnd-1.x updated (1c550954 -> 931844f3)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
from 1c550954 Bump testcontainers.version from 1.20.3 to 1.20.4
new a8d90d5d Do not display client environment unless specifically asked for
new e4828fdf Fix log ordering
new 8fa060e7 Fix color option
new 931844f3 Debug mode should provide better defaults for keepAlive and connectTimeout (fixes #1209)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/mvndaemon/mvnd/client/DaemonConnector.java | 6 ++++++
.../main/java/org/mvndaemon/mvnd/common/Environment.java | 13 ++++++++++++-
common/src/main/java/org/mvndaemon/mvnd/common/Message.java | 13 ++++++++++---
daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java | 11 +++++++++--
4 files changed, 37 insertions(+), 6 deletions(-)
(maven-mvnd) 01/04: Do not display client environment unless specifically asked for
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit a8d90d5dcbc2abcabcc91b2ddac304cd83e49458
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 22 17:58:39 2024 +0100
Do not display client environment unless specifically asked for
---
common/src/main/java/org/mvndaemon/mvnd/common/Message.java | 3 +--
daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java | 11 +++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
index 8b4897bf..9c15c2af 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
@@ -367,8 +367,7 @@ public abstract class Message {
return "BuildRequest{" + "args="
+ args + ", workingDir='"
+ workingDir + '\'' + ", projectDir='"
- + projectDir + '\'' + ", env='"
- + env + '\'' + '}';
+ + projectDir + '\'' + '}';
}
@Override
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
index 9d95876b..89a96152 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -283,9 +283,16 @@ public class Server implements AutoCloseable, Runnable {
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);
(maven-mvnd) 04/04: Debug mode should provide better defaults for keepAlive and connectTimeout (fixes #1209)
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 931844f3d2c2236e796d243ed99c666f2c48eeca
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 25 09:58:31 2024 +0100
Debug mode should provide better defaults for keepAlive and connectTimeout (fixes #1209)
---
client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 912a05e9..a11dcbc1 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -405,6 +405,12 @@ public class DaemonConnector {
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();
(maven-mvnd) 03/04: Fix color option
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 8fa060e7a740849fd938aaf7e9ceef97b828d298
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 25 10:01:48 2024 +0100
Fix color option
---
.../main/java/org/mvndaemon/mvnd/common/Environment.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
index 3132006f..1737d2ae 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
@@ -588,7 +588,18 @@ public enum Environment {
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'.");
+ }
}
}
(maven-mvnd) 02/04: Fix log ordering
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-1.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit e4828fdf98beb1386d26b28e013a1d259de35de6
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat Nov 23 15:12:45 2024 +0100
Fix log ordering
nano time is not enough, rather use a "sequence"
---
common/src/main/java/org/mvndaemon/mvnd/common/Message.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
index 9c15c2af..459f771e 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
@@ -31,6 +31,7 @@ import java.util.LinkedHashMap;
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 abstract class Message {
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 abstract class Message {
}
}
+ public long seq() {
+ return seq;
+ }
+
public long timestamp() {
return timestamp;
}