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/02/04 21:14:53 UTC
[logging-log4j2] branch release-2.x updated (2203b63 -> 30584be)
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 2203b63 Adds support for missing Log4j 1.x properties and fixes default values (#737)
new fb36a04 Log4j 1.2 bridge uses some incorrect default property values in some appenders.
new 30584be Don't be verbose by specifying the default value for an atomic boolean.
The 2 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:
.../org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java | 2 +-
.../log4j/builders/appender/DailyRollingFileAppenderBuilder.java | 2 +-
.../java/org/apache/log4j/builders/appender/FileAppenderBuilder.java | 2 +-
.../org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java | 2 +-
.../main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
.../logging/log4j/core/appender/AsyncAppenderEventDispatcher.java | 2 +-
.../logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java | 2 +-
.../logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java | 2 +-
.../java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +-
src/changes/changes.xml | 3 +++
10 files changed, 12 insertions(+), 9 deletions(-)
[logging-log4j2] 02/02: Don't be verbose by specifying the default value for an atomic boolean.
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 30584be889bbdaad5df7d4b71545362ff8642c99
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Feb 4 16:14:48 2022 -0500
Don't be verbose by specifying the default value for an atomic boolean.
---
.../java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java | 2 +-
.../apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java | 2 +-
.../java/org/apache/log4j/builders/appender/FileAppenderBuilder.java | 2 +-
.../org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java | 2 +-
.../main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
.../logging/log4j/core/appender/AsyncAppenderEventDispatcher.java | 2 +-
.../logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java | 2 +-
.../logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java | 2 +-
.../java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java | 2 +-
src/changes/changes.xml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
index f021f28..1e8a42f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java
@@ -72,7 +72,7 @@ public class ConsoleAppenderBuilder extends AbstractBuilder implements AppenderB
AtomicReference<Layout> layout = new AtomicReference<>();
AtomicReference<List<Filter>> filters = new AtomicReference<>(new ArrayList<>());
AtomicReference<String> level = new AtomicReference<>();
- AtomicBoolean follow = new AtomicBoolean(false);
+ AtomicBoolean follow = new AtomicBoolean();
forEachElement(appenderElement.getChildNodes(), currentElement -> {
switch (currentElement.getTagName()) {
case LAYOUT_TAG:
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
index 071d970..407450f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
@@ -76,7 +76,7 @@ public class DailyRollingFileAppenderBuilder extends AbstractBuilder implements
AtomicReference<String> level = new AtomicReference<>();
AtomicBoolean immediateFlush = new AtomicBoolean(true);
AtomicBoolean append = new AtomicBoolean(true);
- AtomicBoolean bufferedIo = new AtomicBoolean(false);
+ AtomicBoolean bufferedIo = new AtomicBoolean();
AtomicInteger bufferSize = new AtomicInteger(8192);
AtomicReference<String> datePattern = new AtomicReference<String>(DEFAULT_DATE_PATTERN);
forEachElement(appenderElement.getChildNodes(), currentElement -> {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java
index cca775f..14f9468 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java
@@ -68,7 +68,7 @@ public class FileAppenderBuilder extends AbstractBuilder implements AppenderBuil
AtomicReference<String> level = new AtomicReference<>();
AtomicBoolean immediateFlush = new AtomicBoolean(true);
AtomicBoolean append = new AtomicBoolean(true);
- AtomicBoolean bufferedIo = new AtomicBoolean(false);
+ AtomicBoolean bufferedIo = new AtomicBoolean();
AtomicInteger bufferSize = new AtomicInteger(8192);
forEachElement(appenderElement.getChildNodes(), currentElement -> {
switch (currentElement.getTagName()) {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
index c4d263f..f051d31 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
@@ -74,7 +74,7 @@ public class RollingFileAppenderBuilder extends AbstractBuilder implements Appen
AtomicReference<String> fileName = new AtomicReference<>();
AtomicBoolean immediateFlush = new AtomicBoolean(true);
AtomicBoolean append = new AtomicBoolean(true);
- AtomicBoolean bufferedIo = new AtomicBoolean(false);
+ AtomicBoolean bufferedIo = new AtomicBoolean();
AtomicInteger bufferSize = new AtomicInteger(8192);
AtomicReference<String> maxSize = new AtomicReference<>(DEFAULT_MAX_SIZE);
AtomicReference<String> maxBackups = new AtomicReference<>(DEFAULT_MAX_BACKUPS);
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
index dfe0df8..b7ab404 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java
@@ -54,7 +54,7 @@ public class HtmlLayoutBuilder extends AbstractBuilder implements LayoutBuilder
@Override
public Layout parseLayout(Element layoutElement, XmlConfiguration config) {
final AtomicReference<String> title = new AtomicReference<>("Log4J Log Messages");
- final AtomicBoolean locationInfo = new AtomicBoolean(false);
+ final AtomicBoolean locationInfo = new AtomicBoolean();
forEachElement(layoutElement.getElementsByTagName("param"), currentElement -> {
if (currentElement.getTagName().equals(PARAM_TAG)) {
if (TITLE_PARAM.equalsIgnoreCase(currentElement.getAttribute("name"))) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java
index da5c505..35d0127 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppenderEventDispatcher.java
@@ -56,7 +56,7 @@ class AsyncAppenderEventDispatcher extends Log4jThread {
this.errorAppender = errorAppender;
this.appenders = appenders;
this.queue = queue;
- this.stoppedRef = new AtomicBoolean(false);
+ this.stoppedRef = new AtomicBoolean();
}
/**
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java
index 67145c6..15d8d2f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/nosql/AbstractNoSqlConnection.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
*/
public abstract class AbstractNoSqlConnection<W, T extends NoSqlObject<W>> implements NoSqlConnection<W, T> {
- private final AtomicBoolean closed = new AtomicBoolean(false);
+ private final AtomicBoolean closed = new AtomicBoolean();
@Override
public void close() {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
index 8bbec71..d324f4c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
@@ -38,7 +38,7 @@ import org.apache.logging.log4j.util.Supplier;
public class AwaitCompletionReliabilityStrategy implements ReliabilityStrategy, LocationAwareReliabilityStrategy {
private static final int MAX_RETRIES = 3;
private final AtomicInteger counter = new AtomicInteger();
- private final AtomicBoolean shutdown = new AtomicBoolean(false);
+ private final AtomicBoolean shutdown = new AtomicBoolean();
private final Lock shutdownLock = new ReentrantLock();
private final Condition noLogEvents = shutdownLock.newCondition(); // should only be used when shutdown == true
private final LoggerConfig loggerConfig;
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
index 6cb0732..279ada1 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/LoggerConfigBenchmark.java
@@ -58,7 +58,7 @@ public class LoggerConfigBenchmark {
private final boolean includeLocation = true;
private LoggerConfig parent;
private final AtomicInteger counter = new AtomicInteger();
- private final AtomicBoolean shutdown = new AtomicBoolean(false);
+ private final AtomicBoolean shutdown = new AtomicBoolean();
private final Lock shutdownLock = new ReentrantLock();
private final Condition noLogEvents = shutdownLock.newCondition(); // should only be used when shutdown == true
private final LogEvent LOGEVENT = createLogEventWithoutException();
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 59d1492..d8cb19f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -158,7 +158,7 @@
Log4j 1.2 bridge creates a SocketAppender instead of a SyslogAppender.
</action>
<action dev="ggregory" type="fix" due-to="Piotr P. Karwasz">
- Log4j 1.2 bridge uses some incorrect default property values in appenders.
+ Log4j 1.2 bridge uses some incorrect default property values in some appenders.
</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz">
</action>
[logging-log4j2] 01/02: Log4j 1.2 bridge uses some incorrect default property values in some appenders.
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 fb36a0418f097de2311a2bb635437b8976990db6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Feb 4 16:14:39 2022 -0500
Log4j 1.2 bridge uses some incorrect default property values in some
appenders.
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 87b0053..59d1492 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -157,6 +157,9 @@
<action dev="ggregory" type="fix" due-to="Gary Gregory">
Log4j 1.2 bridge creates a SocketAppender instead of a SyslogAppender.
</action>
+ <action dev="ggregory" type="fix" due-to="Piotr P. Karwasz">
+ Log4j 1.2 bridge uses some incorrect default property values in appenders.
+ </action>
<action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz">
</action>
<action dev="ggregory" type="fix">