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 18:46:18 UTC
[logging-log4j2] branch master updated (028a4ed -> 4a4ffaf)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 028a4ed LOG4J2-2816 Handle Disruptor event translation exceptions.
new c4dc8d1 Format nit.
new 33aae0c Remove unused.
new 4a4ffaf Only call getMacAddressString() when needed.
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:
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
[logging-log4j2] 01/03: Format nit.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c4dc8d101657c5bd2eaf05118313157c5738dbf9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 14:43:19 2021 -0400
Format nit.
---
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 2 +-
1 file changed, 1 insertion(+), 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 4179c50..9bb6e77 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
@@ -58,7 +58,7 @@ public class DockerLookup extends AbstractLookup {
}
Container current = null;
try {
- final URL url= new URL(baseUri + "/containers/json");
+ final URL url = new URL(baseUri + "/containers/json");
final String hostName = NetUtils.getLocalHostname();
final String macAddr = NetUtils.getMacAddressString();
[logging-log4j2] 03/03: Only call getMacAddressString() when needed.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4a4ffaffa946d6bd726cce89ef089ce6d15ac52a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 14:45:05 2021 -0400
Only call getMacAddressString() when needed.
---
.../src/main/java/org/apache/logging/log4j/docker/DockerLookup.java | 2 +-
1 file changed, 1 insertion(+), 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 c695fbd..0e04806 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,9 @@ public class DockerLookup extends AbstractLookup {
Container current = null;
try {
final URL url = new URL(baseUri + "/containers/json");
- final String macAddr = NetUtils.getMacAddressString();
if (url.getProtocol().equals(HTTP)) {
+ final String macAddr = NetUtils.getMacAddressString();
final ObjectMapper objectMapper = new ObjectMapper();
final List<Container> containerList = objectMapper.readValue(url, new TypeReference<List<Container>>(){});
[logging-log4j2] 02/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 master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 33aae0cd957b6d45ca437ce01ebc52ea96672111
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 26 14:44:03 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 9bb6e77..c695fbd 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 {
final URL url = new URL(baseUri + "/containers/json");
- final String hostName = NetUtils.getLocalHostname();
final String macAddr = NetUtils.getMacAddressString();
if (url.getProtocol().equals(HTTP)) {