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 2022/01/13 16:06:05 UTC
[logging-log4j2] branch release-2.x updated (7fa4658 -> 74ca8b5)
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 7fa4658 remove .asf.yaml in favor of the file on the master branch
new f2d5d29 Javadoc.
new 0ca8f05 Sort members and use final.
new d65e732 Sort members and use final.
new e404ffa Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
new 8b80ead Remove blank lines.
new 74ca8b5 Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
The 6 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:
.../log4j/helpers/AppenderAttachableImpl.java | 59 ++++++++++++----------
.../org/apache/log4j/legacy/core/CategoryUtil.java | 2 -
2 files changed, 31 insertions(+), 30 deletions(-)
[logging-log4j2] 02/06: Sort members and use final.
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 0ca8f054ffda7db6c44975428242502669f3cdf8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 10:38:50 2022 -0500
Sort members and use final.
---
.../log4j/helpers/AppenderAttachableImpl.java | 44 +++++++++++-----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
index b9e9cdc..455c0ce 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
@@ -41,6 +41,28 @@ public class AppenderAttachableImpl implements AppenderAttachable {
}
}
+ /**
+ * Calls the <code>doAppend</code> method on all attached appenders.
+ *
+ * @param event The event to log.
+ * @return The number of appenders.
+ */
+ public int appendLoopOnAppenders(LoggingEvent event) {
+ for (Appender appender : appenders.values()) {
+ appender.doAppend(event);
+ }
+ return appenders.size();
+ }
+
+ /**
+ * Closes all appenders.
+ */
+ public void close() {
+ for (Appender appender : appenders.values()) {
+ appender.close();
+ }
+ }
+
@Override
public Enumeration<Appender> getAllAppenders() {
return Collections.enumeration(appenders.values());
@@ -71,26 +93,4 @@ public class AppenderAttachableImpl implements AppenderAttachable {
public void removeAppender(String name) {
appenders.remove(name);
}
-
- /**
- * Calls the <code>doAppend</code> method on all attached appenders.
- *
- * @param event The event to log.
- * @return The number of appenders.
- */
- public int appendLoopOnAppenders(LoggingEvent event) {
- for (Appender appender : appenders.values()) {
- appender.doAppend(event);
- }
- return appenders.size();
- }
-
- /**
- * Closes all appenders.
- */
- public void close() {
- for (Appender appender : appenders.values()) {
- appender.close();
- }
- }
}
[logging-log4j2] 05/06: Remove blank lines.
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 8b80eade97bc192044805dd0824ba2f6bf0558b9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 11:05:41 2022 -0500
Remove blank lines.
---
.../src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java b/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
index 6649324..04c47aa 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/legacy/core/CategoryUtil.java
@@ -35,7 +35,6 @@ public final class CategoryUtil {
public static Logger getParent(final Logger logger) {
if (logger instanceof org.apache.logging.log4j.core.Logger) {
return ((org.apache.logging.log4j.core.Logger) logger).getParent();
-
}
return null;
}
@@ -56,7 +55,6 @@ public final class CategoryUtil {
public static void setLevel(final Logger logger, final Level level) {
if (logger instanceof org.apache.logging.log4j.core.Logger) {
((org.apache.logging.log4j.core.Logger) logger).setLevel(level);
-
}
}
[logging-log4j2] 04/06: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
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 e404ffaa1fc35f08bae320ae6bc870c040c88f0c
Merge: d65e732 4a4435e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 10:48:01 2022 -0500
Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
.asf.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[logging-log4j2] 06/06: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
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 74ca8b58f0d4e1b99bab2c4e7b8f56723b705019
Merge: 8b80ead 7fa4658
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 11:05:50 2022 -0500
Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
.asf.yaml | 38 --------------------------------------
1 file changed, 38 deletions(-)
[logging-log4j2] 01/06: 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 f2d5d29f6e707337a9323b5c00c034cd50fa30dc
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 10:37:39 2022 -0500
Javadoc.
---
.../src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
index 9d6472b..b9e9cdc 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
@@ -85,6 +85,9 @@ public class AppenderAttachableImpl implements AppenderAttachable {
return appenders.size();
}
+ /**
+ * Closes all appenders.
+ */
public void close() {
for (Appender appender : appenders.values()) {
appender.close();
[logging-log4j2] 03/06: Sort members and use final.
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 d65e73206b8bc87498d2e0a10e15cce1cb78f172
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 10:39:24 2022 -0500
Sort members and use final.
---
.../log4j/helpers/AppenderAttachableImpl.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
index 455c0ce..a4bf87a 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/AppenderAttachableImpl.java
@@ -16,16 +16,16 @@
*/
package org.apache.log4j.helpers;
-import org.apache.log4j.Appender;
-import org.apache.log4j.spi.AppenderAttachable;
-import org.apache.log4j.spi.LoggingEvent;
-
import java.util.Collections;
import java.util.Enumeration;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.apache.log4j.Appender;
+import org.apache.log4j.spi.AppenderAttachable;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* Allows Classes to attach Appenders.
*/
@@ -34,7 +34,7 @@ public class AppenderAttachableImpl implements AppenderAttachable {
private final ConcurrentMap<String, Appender> appenders = new ConcurrentHashMap<>();
@Override
- public void addAppender(Appender newAppender) {
+ public void addAppender(final Appender newAppender) {
if (newAppender != null) {
// NullAppender name is null.
appenders.put(Objects.toString(newAppender.getName()), newAppender);
@@ -43,12 +43,12 @@ public class AppenderAttachableImpl implements AppenderAttachable {
/**
* Calls the <code>doAppend</code> method on all attached appenders.
- *
+ *
* @param event The event to log.
* @return The number of appenders.
*/
- public int appendLoopOnAppenders(LoggingEvent event) {
- for (Appender appender : appenders.values()) {
+ public int appendLoopOnAppenders(final LoggingEvent event) {
+ for (final Appender appender : appenders.values()) {
appender.doAppend(event);
}
return appenders.size();
@@ -58,7 +58,7 @@ public class AppenderAttachableImpl implements AppenderAttachable {
* Closes all appenders.
*/
public void close() {
- for (Appender appender : appenders.values()) {
+ for (final Appender appender : appenders.values()) {
appender.close();
}
}
@@ -69,13 +69,13 @@ public class AppenderAttachableImpl implements AppenderAttachable {
}
@Override
- public Appender getAppender(String name) {
+ public Appender getAppender(final String name) {
// No null keys allowed in a CHM.
return name == null ? null : appenders.get(name);
}
@Override
- public boolean isAttached(Appender appender) {
+ public boolean isAttached(final Appender appender) {
return appenders.containsValue(appender);
}
@@ -85,12 +85,12 @@ public class AppenderAttachableImpl implements AppenderAttachable {
}
@Override
- public void removeAppender(Appender appender) {
+ public void removeAppender(final Appender appender) {
appenders.remove(appender.getName(), appender);
}
@Override
- public void removeAppender(String name) {
+ public void removeAppender(final String name) {
appenders.remove(name);
}
}