You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2021/07/26 14:59:22 UTC
[logging-log4j2] branch release-2.x updated (d6a512b -> 0eaf6e2)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from d6a512b LOG4J2-2816 Handle Disruptor event translation exceptions.
new eb750e2 Remove unused.
new 3f9a44e Only call getMacAddressString if needed.
new 0eaf6e2 Javadoc.
The 3 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:
.../main/java/org/apache/logging/log4j/docker/DockerLookup.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
[logging-log4j2] 02/03: Only call getMacAddressString if needed.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3f9a44ead6bcea26178dfddbd7fb0d4bc8e2babd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 09:39:06 2021 -0400
Only call getMacAddressString if needed.
---
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
index d63aa92..ba045bb 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
@@ -59,9 +59,8 @@ public class DockerLookup extends AbstractLookup {
Container current = null;
try {
URL url= new URL(baseUri + "/containers/json");
- String macAddr = NetUtils.getMacAddressString();
-
if (url.getProtocol().equals(HTTP)) {
+ String macAddr = NetUtils.getMacAddressString();
ObjectMapper objectMapper = new ObjectMapper();
List<Container> containerList = objectMapper.readValue(url, new TypeReference<List<Container>>(){});
[logging-log4j2] 03/03: Javadoc.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 0eaf6e21e3de633a03ce7decb3cf1ec01db48ae5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 10:59:17 2021 -0400
Javadoc.
---
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
index ba045bb..a9cc1e2 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
- *
+ * Lookups up keys for for a Docker container.
*/
@Plugin(name = "docker", category = StrLookup.CATEGORY)
public class DockerLookup extends AbstractLookup {
@@ -45,6 +45,9 @@ public class DockerLookup extends AbstractLookup {
private static final String HTTP = "http";
private final Container container;
+ /**
+ * Constructs a new instance.
+ */
public DockerLookup() {
String baseUri = System.getenv(DOCKER_URI);
if (baseUri == null) {
[logging-log4j2] 01/03: Remove unused.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit eb750e2dde7f8e00c8c208579e410fc83ac9ac3f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 09:35:26 2021 -0400
Remove unused.
---
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
index f09df6e..d63aa92 100644
--- a/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
+++ b/log4j-docker/src/main/java/org/apache/logging/log4j/docker/DockerLookup.java
@@ -59,7 +59,6 @@ public class DockerLookup extends AbstractLookup {
Container current = null;
try {
URL url= new URL(baseUri + "/containers/json");
- String hostName = NetUtils.getLocalHostname();
String macAddr = NetUtils.getMacAddressString();
if (url.getProtocol().equals(HTTP)) {