You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/09/01 16:32:46 UTC
[01/50] logging-log4j2 git commit: Use try-with-resources.
Repository: logging-log4j2
Updated Branches:
refs/heads/feature/LOG4J2-1430 849fdb8f8 -> 41ea561fb
Use try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/11930be7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/11930be7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/11930be7
Branch: refs/heads/feature/LOG4J2-1430
Commit: 11930be7de1836227128254769ea93cba9fea75e
Parents: f936a6d
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:31:13 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:31:13 2016 -0700
----------------------------------------------------------------------
.../db/jpa/JpaHyperSqlAppenderTest.java | 28 +++++++++-----------
1 file changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/11930be7/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
index a5379c3..4748b59 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
@@ -39,21 +39,19 @@ public class JpaHyperSqlAppenderTest extends AbstractJpaAppenderTest {
protected Connection setUpConnection() throws SQLException {
final Connection connection = DriverManager.getConnection("jdbc:hsqldb:mem:Log4j", USER_ID, PASSWORD);
- Statement statement = connection.createStatement();
- statement.executeUpdate("CREATE TABLE jpaBaseLogEntry ( " +
- "id INTEGER IDENTITY, eventDate DATETIME, level VARCHAR(10), logger VARCHAR(255), " +
- "message VARCHAR(1024), exception VARCHAR(1048576)" +
- " )");
- statement.close();
-
- statement = connection.createStatement();
- statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
- "id INTEGER IDENTITY, timemillis BIGINT, nanoTime BIGINT, level VARCHAR(10), loggerName VARCHAR(255), " +
- "message VARCHAR(1024), thrown VARCHAR(1048576), contextMapJson VARCHAR(1048576)," +
- "loggerFQCN VARCHAR(1024), contextStack VARCHAR(1048576), marker VARCHAR(255), source VARCHAR(2048)," +
- "threadId BIGINT, threadName NVARCHAR(255), threadPriority INTEGER" +
- " )");
- statement.close();
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate("CREATE TABLE jpaBaseLogEntry ( "
+ + "id INTEGER IDENTITY, eventDate DATETIME, level VARCHAR(10), logger VARCHAR(255), "
+ + "message VARCHAR(1024), exception VARCHAR(1048576)" + " )");
+ }
+
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( "
+ + "id INTEGER IDENTITY, timemillis BIGINT, nanoTime BIGINT, level VARCHAR(10), loggerName VARCHAR(255), "
+ + "message VARCHAR(1024), thrown VARCHAR(1048576), contextMapJson VARCHAR(1048576),"
+ + "loggerFQCN VARCHAR(1024), contextStack VARCHAR(1048576), marker VARCHAR(255), source VARCHAR(2048),"
+ + "threadId BIGINT, threadName NVARCHAR(255), threadPriority INTEGER" + " )");
+ }
return connection;
}
[15/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ". Clean ups.
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ". Clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a9806326
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a9806326
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a9806326
Branch: refs/heads/feature/LOG4J2-1430
Commit: a9806326f73a5f3eabb7adf7d45a83e914af9e37
Parents: 05bbe44
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 17:42:01 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 17:42:01 2016 -0700
----------------------------------------------------------------------
.../core/appender/CsvJsonParameterLayoutFileAppenderTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a9806326/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index 84578fc..9526e99 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -68,13 +68,13 @@ public class CsvJsonParameterLayoutFileAppenderTest {
@Test
public void testNoNulCharactersABC() throws IOException {
- testNoNulCharacters("ABC");;
+ testNoNulCharacters("ABC");
}
@Test
@Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
public void testNoNulCharactersJson() throws IOException {
- testNoNulCharacters("{\"id\":10,\"name\":\"Alice\"}");;
+ testNoNulCharacters("{\"id\":10,\"name\":\"Alice\"}");
}
@Test
[23/50] logging-log4j2 git commit: [LOG4J2-1235]
org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working
correctly.
Posted by ma...@apache.org.
[LOG4J2-1235]
org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not
working correctly.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c85a63c0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c85a63c0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c85a63c0
Branch: refs/heads/feature/LOG4J2-1430
Commit: c85a63c095e86a165e733e5b07e813ec8788a803
Parents: daa6776
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 11:40:03 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 11:40:03 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c85a63c0/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6a12f64..b901033 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -96,6 +96,9 @@
<action issue="LOG4J2-1313" dev="rpopma" type="fix" due-to="Philipp Knobel">
Properties declared in configuration can now have their value either in the element body or in an attribute named "value".
</action>
+ <action issue="LOG4J2-1235" dev="ggregory" type="fix" due-to="Niranjan Rao, Sascha Scholz, Aleksey Zvolinsky">
+ org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working correctly.
+ </action>
<action issue="LOG4J2-1181" dev="mikes" type="add">
Scala API.
</action>
[49/50] logging-log4j2 git commit: Ensure consistent attribute
ordering when building XML configuration
Posted by ma...@apache.org.
Ensure consistent attribute ordering when building XML configuration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1dc04f83
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1dc04f83
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1dc04f83
Branch: refs/heads/feature/LOG4J2-1430
Commit: 1dc04f83f5128598425d2cfdda7317f873f5c0ff
Parents: 878e8bc
Author: Mikael St�ldal <mi...@magine.com>
Authored: Thu Sep 1 18:03:00 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Thu Sep 1 18:03:00 2016 +0200
----------------------------------------------------------------------
.../logging/log4j/core/config/builder/api/Component.java | 4 ++--
.../core/config/builder/impl/DefaultComponentBuilder.java | 4 ++--
.../log4j/core/config/builder/ConfigurationBuilderTest.java | 9 ++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
index 8ad901f..2832d58 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/Component.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.api;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -28,7 +28,7 @@ import java.util.Map;
*/
public class Component {
- private final Map<String, String> attributes = new HashMap<>();
+ private final Map<String, String> attributes = new LinkedHashMap<>();
private final List<Component> components = new ArrayList<>();
private final String pluginType;
private final String value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
index d1c066c..b73039d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultComponentBuilder.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.builder.impl;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -38,7 +38,7 @@ class DefaultComponentBuilder<T extends ComponentBuilder<T>, CB extends Configur
private final CB builder;
private final String type;
- private final Map<String, String> attributes = new HashMap<>();
+ private final Map<String, String> attributes = new LinkedHashMap<>();
private final List<Component> components = new ArrayList<>();
private final String name;
private final String value;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dc04f83/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 25772a7..eb11d5d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -24,7 +24,6 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.junit.Test;
-import org.xmlunit.matchers.CompareMatcher;
import static org.junit.Assert.*;
@@ -60,12 +59,12 @@ public class ConfigurationBuilderTest {
"\t\t<Property name=\"MyKey\">MyValue</Property>" + EOL +
"\t</Properties>" + EOL +
"\t<Scripts>" + EOL +
- "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
+ "\t\t<ScriptFile name=\"target/test-classes/scripts/filter.groovy\" path=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
"\t</Scripts>" + EOL +
"\t<CustomLevels>" + EOL +
"\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + EOL +
"\t</CustomLevels>" + EOL +
- "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + EOL +
+ "\t<ThresholdFilter onMatch=\"ACCEPT\" onMisMatch=\"NEUTRAL\" level=\"DEBUG\"/>" + EOL +
"\t<Appenders>" + EOL +
"\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + EOL +
"\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
@@ -73,7 +72,7 @@ public class ConfigurationBuilderTest {
"\t\t</CONSOLE>" + EOL +
"\t</Appenders>" + EOL +
"\t<Loggers>" + EOL +
- "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + EOL +
+ "\t\t<Logger name=\"org.apache.logging.log4j\" level=\"DEBUG\" includeLocation=\"true\" additivity=\"false\">" + EOL +
"\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
"\t\t</Logger>" + EOL +
"\t\t<Root level=\"ERROR\">" + EOL +
@@ -87,7 +86,7 @@ public class ConfigurationBuilderTest {
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
addTestFixtures("config name", builder);
final String xmlConfiguration = builder.toXmlConfiguration();
- assertThat(xmlConfiguration, CompareMatcher.isIdenticalTo(expectedXml));
+ assertEquals(expectedXml, xmlConfiguration);
}
}
[14/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ". More tests.
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ". More tests.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/05bbe44a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/05bbe44a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/05bbe44a
Branch: refs/heads/feature/LOG4J2-1430
Commit: 05bbe44a991b4fbb76d138a902285c7951c33cea
Parents: 8d873b0
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 17:41:39 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 17:41:39 2016 -0700
----------------------------------------------------------------------
.../CsvJsonParameterLayoutFileAppenderTest.java | 26 +++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/05bbe44a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index 4722c3a..84578fc 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -42,14 +42,11 @@ public class CsvJsonParameterLayoutFileAppenderTest {
@Rule
public RuleChain rule = loggerContextRule.withCleanFilesRule(FILE_PATH);
- @Test
- @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
- public void testNoNulCharacters() throws IOException {
+ public void testNoNulCharacters(final String message) throws IOException {
@SuppressWarnings("resource")
final LoggerContext loggerContext = loggerContextRule.getLoggerContext();
final Logger logger = loggerContext.getLogger("com.example");
- final String json = "{\"id\":10,\"name\":\"Alice\"}";
- logger.error("log:", json);
+ logger.error("log:", message);
loggerContext.stop();
final File file = new File(FILE_PATH);
final byte[] contents = Files.toByteArray(file);
@@ -66,6 +63,23 @@ public class CsvJsonParameterLayoutFileAppenderTest {
Assert.assertEquals("File contains " + count0s + " 0x00 byte at indices " + sb, 0, count0s);
final List<String> readLines = Files.readLines(file, Charset.defaultCharset());
final String actual = readLines.get(0);
- Assert.assertTrue(actual, actual.contains(json));
+ Assert.assertTrue(actual, actual.contains(message));
+ }
+
+ @Test
+ public void testNoNulCharactersABC() throws IOException {
+ testNoNulCharacters("ABC");;
+ }
+
+ @Test
+ @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
+ public void testNoNulCharactersJson() throws IOException {
+ testNoNulCharacters("{\"id\":10,\"name\":\"Alice\"}");;
+ }
+
+ @Test
+ @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
+ public void testNoNulCharactersXml() throws IOException {
+ testNoNulCharacters("<test attr1='val1' attr2=\"value2\">X</test>");
}
}
[28/50] logging-log4j2 git commit: [LOG4J2-1548]
[CronTriggeringPolicy] ConfigurationScheduler schedules the task infinitely
after first fire. Applied patch
https://issues.apache.org/jira/secure/attachment/12825955/LOG4J2-1548-testcase-cleanFoldersRule.p
Posted by ma...@apache.org.
[LOG4J2-1548] [CronTriggeringPolicy] ConfigurationScheduler schedules
the task infinitely after first fire. Applied patch
https://issues.apache.org/jira/secure/attachment/12825955/LOG4J2-1548-testcase-cleanFoldersRule.patch
: a small fix in the test to clean working folder after execution.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ef321c14
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ef321c14
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ef321c14
Branch: refs/heads/feature/LOG4J2-1430
Commit: ef321c140125482e1481df37b527add043e1164b
Parents: b46c23c
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 13:01:48 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 13:01:48 2016 -0700
----------------------------------------------------------------------
.../core/appender/rolling/RollingAppenderCronOnceADayTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ef321c14/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
index f995990..7e10367 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
@@ -78,7 +78,7 @@ public class RollingAppenderCronOnceADayTest {
private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG_TARGET);
@Rule
- public RuleChain chain = loggerContextRule.withCleanFoldersRule(true, false, 1, DIR);
+ public RuleChain chain = loggerContextRule.withCleanFoldersRule(DIR);
@Test
public void testAppender() throws Exception {
[34/50] logging-log4j2 git commit: Fix error handling in Log4j 1
configuration
Posted by ma...@apache.org.
Fix error handling in Log4j 1 configuration
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2e2dc8ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2e2dc8ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2e2dc8ee
Branch: refs/heads/feature/LOG4J2-1430
Commit: 2e2dc8eebf0f0e3e856c7ed856109cc3e7b09736
Parents: b0f568e
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Aug 31 11:40:12 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Aug 31 11:40:12 2016 +0200
----------------------------------------------------------------------
.../config/Log4j1ConfigurationFactory.java | 1 -
.../log4j/config/Log4j1ConfigurationParser.java | 20 +++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e2dc8ee/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
index 0a6bf2a..d6eb444 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
@@ -47,7 +47,6 @@ public class Log4j1ConfigurationFactory extends ConfigurationFactory {
} catch (IOException e) {
throw new ConfigurationException("Unable to load " + source.toString(), e);
}
- if (builder == null) return null;
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2e2dc8ee/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index 84b8533..9356584 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -16,8 +16,16 @@
*/
package org.apache.log4j.config;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ComponentBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
@@ -27,13 +35,6 @@ import org.apache.logging.log4j.core.config.builder.api.RootLoggerComponentBuild
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.apache.logging.log4j.status.StatusLogger;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
/**
* Experimental parser for Log4j 1.2 properties configuration files.
* <p>
@@ -63,8 +64,9 @@ public class Log4j1ConfigurationParser {
* Parse a Log4j 1.2 properties configuration file into a ConfigurationBuilder.
*
* @param input InputStream to read from, will not be closed.
- * @return the populated ConfigurationBuilder
+ * @return the populated ConfigurationBuilder, never {@literal null}
* @throws IOException if unable to read the input
+ * @throws ConfigurationException if the input does not contain a valid configuration
*/
public ConfigurationBuilder<BuiltConfiguration> buildConfigurationBuilder(final InputStream input) throws IOException {
properties.load(input);
@@ -72,7 +74,7 @@ public class Log4j1ConfigurationParser {
final String rootLoggerValue = getLog4jValue("rootLogger");
if (rootCategoryValue == null && rootLoggerValue == null) {
// This is not a Log4j 1 properties configuration file.
- return null;
+ throw new ConfigurationException("Input does not contain a valid Log4j 1.x properties configuration");
}
builder.setConfigurationName("Log4j1");
// DEBUG
[04/50] logging-log4j2 git commit: Use try-with-resources for JDBC
resources.
Posted by ma...@apache.org.
Use try-with-resources for JDBC resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/94072a1e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/94072a1e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/94072a1e
Branch: refs/heads/feature/LOG4J2-1430
Commit: 94072a1ec7802b493e1caeb57fd05b29df288afc
Parents: b6ecddc
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:34:26 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:34:26 2016 -0700
----------------------------------------------------------------------
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +++++++++-----------
1 file changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/94072a1e/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
index 638fbe4..6e80d9e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
@@ -35,21 +35,19 @@ public class JpaH2AppenderTest extends AbstractJpaAppenderTest {
protected Connection setUpConnection() throws SQLException {
final Connection connection = DriverManager.getConnection("jdbc:h2:mem:Log4j", USER_ID, PASSWORD);
- Statement statement = connection.createStatement();
- statement.executeUpdate("CREATE TABLE jpaBaseLogEntry ( " +
- "id INTEGER IDENTITY, eventDate DATETIME, level NVARCHAR(10), logger NVARCHAR(255), " +
- "message NVARCHAR(1024), exception NVARCHAR(1048576)" +
- " )");
- statement.close();
-
- statement = connection.createStatement();
- statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
- "id INTEGER IDENTITY, timemillis BIGINT, nanoTime BIGINT, level NVARCHAR(10), loggerName NVARCHAR(255), " +
- "message NVARCHAR(1024), thrown NVARCHAR(1048576), contextMapJson NVARCHAR(1048576)," +
- "loggerFQCN NVARCHAR(1024), contextStack NVARCHAR(1048576), marker NVARCHAR(255), source NVARCHAR(2048)," +
- "threadId BIGINT, threadName NVARCHAR(255), threadPriority INTEGER" +
- " )");
- statement.close();
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate("CREATE TABLE jpaBaseLogEntry ( "
+ + "id INTEGER IDENTITY, eventDate DATETIME, level NVARCHAR(10), logger NVARCHAR(255), "
+ + "message NVARCHAR(1024), exception NVARCHAR(1048576)" + " )");
+ }
+
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( "
+ + "id INTEGER IDENTITY, timemillis BIGINT, nanoTime BIGINT, level NVARCHAR(10), loggerName NVARCHAR(255), "
+ + "message NVARCHAR(1024), thrown NVARCHAR(1048576), contextMapJson NVARCHAR(1048576),"
+ + "loggerFQCN NVARCHAR(1024), contextStack NVARCHAR(1048576), marker NVARCHAR(255), source NVARCHAR(2048),"
+ + "threadId BIGINT, threadName NVARCHAR(255), threadPriority INTEGER" + " )");
+ }
return connection;
}
[41/50] logging-log4j2 git commit: [LOG4J2-1553] AbstractManager
should implement AutoCloseable.
Posted by ma...@apache.org.
[LOG4J2-1553] AbstractManager should implement AutoCloseable.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/48117f87
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/48117f87
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/48117f87
Branch: refs/heads/feature/LOG4J2-1430
Commit: 48117f8753b141f6a62dbb8cfda187bb88f667c0
Parents: 1dee393
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 10:42:39 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 10:42:39 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/48117f87/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fd1d09b..bdaaca8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -102,6 +102,9 @@
<action issue="LOG4J2-1502" dev="ggregory" type="fix" due-to="Sumit Singhal">
CsvParameterLayout and CsvLogEventLayout insert NUL characters if data starts with {, (, [ or "
</action>
+ <action issue="LOG4J2-1553" dev="ggregory" type="add">
+ AbstractManager should implement AutoCloseable.
+ </action>
<action issue="LOG4J2-1528" dev="mikes" type="add">
Create XML configuration file from ConfigurationBuilder.
</action>
[42/50] logging-log4j2 git commit: [LOG4J2-1556] Custom Log4j threads
should extend Log4jThread.
Posted by ma...@apache.org.
[LOG4J2-1556] Custom Log4j threads should extend Log4jThread.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c6ecfc45
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c6ecfc45
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c6ecfc45
Branch: refs/heads/feature/LOG4J2-1430
Commit: c6ecfc45b1482f2d2c3b98c1520cc657f2710f41
Parents: 48117f8
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 13:37:19 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 13:37:19 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/AsyncAppender.java | 3 ++-
.../org/apache/logging/log4j/core/net/TcpSocketManager.java | 5 +++--
.../apache/logging/log4j/core/net/server/TcpSocketServer.java | 2 +-
.../logging/log4j/flume/appender/FlumePersistentManager.java | 2 +-
src/changes/changes.xml | 3 +++
5 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c6ecfc45/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 7a449d2..7b6e985 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -43,6 +43,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.core.util.Log4jThread;
/**
* Appends to one or more Appenders asynchronously. You can configure an AsyncAppender with one or more Appenders and an
@@ -261,7 +262,7 @@ public final class AsyncAppender extends AbstractAppender {
/**
* Thread that calls the Appenders.
*/
- private class AsyncThread extends Thread {
+ private class AsyncThread extends Log4jThread {
private volatile boolean shutdown = false;
private final List<AppenderControl> appenders;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c6ecfc45/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index a34ce30..e4bb1a5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -33,6 +33,7 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ManagerFactory;
import org.apache.logging.log4j.core.appender.OutputStreamManager;
+import org.apache.logging.log4j.core.util.Log4jThread;
import org.apache.logging.log4j.util.Strings;
/**
@@ -72,7 +73,7 @@ public class TcpSocketManager extends AbstractSocketManager {
* @param port The port number on the host.
* @param connectTimeoutMillis the connect timeout in milliseconds.
* @param delay Reconnection interval.
- * @param immediateFail
+ * @param immediateFail
* @param layout The Layout.
*/
public TcpSocketManager(final String name, final OutputStream os, final Socket sock, final InetAddress inetAddress,
@@ -180,7 +181,7 @@ public class TcpSocketManager extends AbstractSocketManager {
/**
* Handles reconnecting to a Thread.
*/
- private class Reconnector extends Thread {
+ private class Reconnector extends Log4jThread {
private final CountDownLatch latch = new CountDownLatch(1);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c6ecfc45/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
index f32fbe8..aacdfb8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java
@@ -45,7 +45,7 @@ public class TcpSocketServer<T extends InputStream> extends AbstractSocketServer
/**
* Thread that processes the events.
*/
- private class SocketHandler extends Thread {
+ private class SocketHandler extends Log4jThread {
private final T inputStream;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c6ecfc45/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
index a76065a..9442abe 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
@@ -476,7 +476,7 @@ public class FlumePersistentManager extends FlumeAvroManager {
/**
* Thread that sends data to Flume and pulls it from Berkeley DB.
*/
- private static class WriterThread extends Thread {
+ private static class WriterThread extends Log4jThread {
private volatile boolean shutdown = false;
private final Database database;
private final Environment environment;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c6ecfc45/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bdaaca8..2b3d14c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -156,6 +156,9 @@
<action issue="LOG4J2-1540" dev="ggregory" type="add" due-to="Gary Gregory">
The Core AbstractManager should track its LoggerContext.
</action>
+ <action issue="LOG4J2-1556" dev="ggregory" type="update">
+ Custom Log4j threads should extend Log4jThread.
+ </action>
<action issue="LOG4J2-1458" dev="ggregory" type="update">
Update Jackson from 2.7.5 to 2.8.0.
</action>
[27/50] logging-log4j2 git commit: [LOG4J2-1553] AbstractManager
should implement AutoCloseable.
Posted by ma...@apache.org.
[LOG4J2-1553] AbstractManager should implement AutoCloseable.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a0d08f3f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a0d08f3f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a0d08f3f
Branch: refs/heads/feature/LOG4J2-1430
Commit: a0d08f3f7380f6cb5a814eb1acaf2ce6464e0434
Parents: e9b9ad9
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 12:57:16 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 12:57:16 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/appender/AbstractManager.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a0d08f3f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
index 450d14b..4855a12 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
@@ -29,6 +29,12 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Abstract base class used to register managers.
+ * <p>
+ * This class implements {@link AutoCloseable} mostly to allow unit tests to be written safely and succinctly. While
+ * managers do need to allocate resources (usually on construction) and then free these resources, a manager is longer
+ * lived than other auto-closeable objects like streams. None the less, making a manager AutoCloseable forces readers to
+ * be aware of the the pattern: allocate resources on construction and call {@link #close()} at some point.
+ * </p>
*/
public abstract class AbstractManager implements AutoCloseable {
[21/50] logging-log4j2 git commit: Fixed compilation error after
rebase
Posted by ma...@apache.org.
Fixed compilation error after rebase
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8968716e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8968716e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8968716e
Branch: refs/heads/feature/LOG4J2-1430
Commit: 8968716e8edb24d2c0833d73c2a583bab9917e22
Parents: 183fbf2
Author: Aleksey Zvolinsky <al...@zvolinsky.name>
Authored: Fri Aug 5 12:04:47 2016 +0300
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 10:20:55 2016 -0700
----------------------------------------------------------------------
.../log4j/core/appender/routing/RoutingAppender.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8968716e/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index 7e11254..18b7777 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -116,7 +116,7 @@ public final class RoutingAppender extends AbstractAppender {
if (control != null) {
control.callAppender(event);
}
-
+
if (purgePolicy != null) {
purgePolicy.update(key, event);
}
@@ -171,20 +171,17 @@ public final class RoutingAppender extends AbstractAppender {
LOGGER.error("No Appender was configured for route " + route.getKey());
return null;
}
-
+
public Map<String, AppenderControl> getAppenders() {
return Collections.unmodifiableMap(appenders);
}
-
+
/**
* Delete specified appender
- *
+ *
* @param key The appender's key
*/
public void deleteAppender(final String key) {
- LOGGER.debug("Stopping route with key" + key);
- AppenderControl control = appenders.remove(key);
- control.getAppender().stop();
LOGGER.debug("Deleting route with " + key + " key ");
final AppenderControl control = appenders.remove(key);
if (null != control) {
[03/50] logging-log4j2 git commit: Use try-with-resources for JDBC
resources.
Posted by ma...@apache.org.
Use try-with-resources for JDBC resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6ecddc5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6ecddc5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6ecddc5
Branch: refs/heads/feature/LOG4J2-1430
Commit: b6ecddc584fc0339dad323b4da69d6fc76c50b33
Parents: c4962aa
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:33:35 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:33:35 2016 -0700
----------------------------------------------------------------------
.../core/appender/db/jpa/AbstractJpaAppenderTest.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6ecddc5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
index 8fb2aaa..b150f1e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
@@ -68,18 +68,8 @@ public abstract class AbstractJpaAppenderTest {
context.reconfigure();
StatusLogger.getLogger().reset();
- Statement statement = null;
- try {
- statement = this.connection.createStatement();
+ try (Statement statement = this.connection.createStatement();) {
statement.execute("SHUTDOWN");
- } finally {
- try {
- if (statement != null) {
- statement.close();
- }
- } catch (final SQLException ignore) {
- /* */
- }
}
this.connection.close();
[17/50] logging-log4j2 git commit: LOG4J2-1235 -
org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working
correctly 1. Removed issue with NPE when tries to delete already deleted
appender 2. Added parameter checkInterval for cases when
Posted by ma...@apache.org.
LOG4J2-1235 - org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working correctly 1. Removed issue with NPE when tries to delete already deleted appender 2. Added parameter checkInterval for cases when all appenders already purged, so scheduler will keep working with this interval 3. Fixed an issue when appender purged even if received new event to it during purge procedure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/040e29e2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/040e29e2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/040e29e2
Branch: refs/heads/feature/LOG4J2-1430
Commit: 040e29e209133efef788eb4132de30262d954ee4
Parents: af7d1a0
Author: Aleksey Zvolinsky <al...@zvolinsky.name>
Authored: Fri May 27 15:29:37 2016 +0300
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 10:20:53 2016 -0700
----------------------------------------------------------------------
.../core/appender/routing/IdlePurgePolicy.java | 56 +++++++++++++-------
.../core/appender/routing/RoutingAppender.java | 14 +++--
.../routing/RoutingAppenderWithPurgingTest.java | 19 +++++--
3 files changed, 64 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/040e29e2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index f4f6e35..dacf993 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
@@ -32,7 +31,6 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.status.StatusLogger;
/**
* Policy is purging appenders that were not in use specified time in minutes
@@ -41,15 +39,16 @@ import org.apache.logging.log4j.status.StatusLogger;
@Scheduled
public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, Runnable {
- private static final Logger LOGGER = StatusLogger.getLogger();
private final long timeToLive;
+ private final long checkInterval;
private final ConcurrentMap<String, Long> appendersUsage = new ConcurrentHashMap<>();
private RoutingAppender routingAppender;
private final ConfigurationScheduler scheduler;
private volatile ScheduledFuture<?> future = null;
- public IdlePurgePolicy(final long timeToLive, final ConfigurationScheduler scheduler) {
+ public IdlePurgePolicy(long timeToLive, long checkInterval, final ConfigurationScheduler scheduler) {
this.timeToLive = timeToLive;
+ this.checkInterval = checkInterval;
this.scheduler = scheduler;
}
@@ -73,8 +72,9 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
for (final Entry<String, Long> entry : appendersUsage.entrySet()) {
if (entry.getValue() < createTime) {
LOGGER.debug("Removing appender " + entry.getKey());
- appendersUsage.remove(entry.getKey());
- routingAppender.deleteAppender(entry.getKey());
+ if(appendersUsage.remove(entry.getKey(), entry.getValue())) {
+ routingAppender.deleteAppender(entry.getKey());
+ }
}
}
}
@@ -100,33 +100,39 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
}
private void scheduleNext() {
- long createTime = Long.MAX_VALUE;
+ long updateTime = Long.MAX_VALUE;
for (final Entry<String, Long> entry : appendersUsage.entrySet()) {
- if (entry.getValue() < createTime) {
- createTime = entry.getValue();
+ if (entry.getValue() < updateTime) {
+ updateTime = entry.getValue();
}
}
- if (createTime < Long.MAX_VALUE) {
- final long interval = timeToLive - (System.currentTimeMillis() - createTime);
+
+ if (updateTime < Long.MAX_VALUE) {
+ long interval = timeToLive - (System.currentTimeMillis() - updateTime);
future = scheduler.schedule(this, interval, TimeUnit.MILLISECONDS);
+ } else {
+ // reset to initial state - in case of all appenders already purged
+ future = scheduler.schedule(this, checkInterval, TimeUnit.MILLISECONDS);
}
}
/**
* Create the PurgePolicy
*
- * @param timeToLive the number of increments of timeUnit before the Appender should be purged.
- * @param timeUnit the unit of time the timeToLive is expressed in.
+ * @param timeToLive the number of increments of timeUnit before the Appender should be purged.
+ * @param checkInterval when all appenders purged, the number of increments of timeUnit to check if any appenders appeared
+ * @param timeUnit the unit of time the timeToLive and the checkInterval is expressed in.
* @return The Routes container.
*/
@PluginFactory
public static PurgePolicy createPurgePolicy(
@PluginAttribute("timeToLive") final String timeToLive,
+ @PluginAttribute("checkInterval") final String checkInterval,
@PluginAttribute("timeUnit") final String timeUnit,
@PluginConfiguration final Configuration configuration) {
if (timeToLive == null) {
- LOGGER.error("A timeToLive value is required");
+ LOGGER.error("A timeToLive value is required");
return null;
}
TimeUnit units;
@@ -136,15 +142,29 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
try {
units = TimeUnit.valueOf(timeUnit.toUpperCase());
} catch (final Exception ex) {
- LOGGER.error("Invalid time unit {}", timeUnit);
+ LOGGER.error("Invalid timeUnit value {}. timeUnit set to MINUTES", timeUnit, ex);
units = TimeUnit.MINUTES;
}
}
- final long ttl = units.toMillis(Long.parseLong(timeToLive));
-
+ long ttl = units.toMillis(Long.parseLong(timeToLive));
+ if(ttl < 0) {
+ LOGGER.error("timeToLive must be positive. timeToLive set to 0");
+ ttl = 0;
+ }
+
+ long ci;
+ if(checkInterval == null) {
+ ci = ttl;
+ } else {
+ ci = units.toMillis(Long.parseLong(checkInterval));
+ if(ci < 0) {
+ LOGGER.error("checkInterval must be positive. checkInterval set equal to timeToLive = {}", ttl);
+ ci = ttl;
+ }
+ }
- return new IdlePurgePolicy(ttl, configuration.getScheduler());
+ return new IdlePurgePolicy(ttl, ci, configuration.getScheduler());
}
@Override
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/040e29e2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index 0df19eb..059413d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -182,9 +182,17 @@ public final class RoutingAppender extends AbstractAppender {
* @param key The appender's key
*/
public void deleteAppender(final String key) {
- LOGGER.debug("Stopping route with key" + key);
- final AppenderControl control = appenders.remove(key);
- control.getAppender().stop();
+ LOGGER.debug("Stopping route with key" + key);
+ AppenderControl control = appenders.remove(key);
+ control.getAppender().stop();
+ LOGGER.debug("Deleting route with " + key + " key ");
+ AppenderControl control = appenders.remove(key);
+ if(null != control) {
+ LOGGER.debug("Stopping route with " + key + " key");
+ control.getAppender().stop();
+ } else {
+ LOGGER.debug("Route with " + key + " key already deleted");
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/040e29e2/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index 8fdb402..9fc4005 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -105,11 +105,22 @@ public class RoutingAppenderWithPurgingTest {
assertEquals("Incorrect number of appenders with IdlePurgePolicy.", 1, routingAppenderIdle.getAppenders().size());
assertEquals("Incorrect number of appenders with manual purge.", 0, routingAppenderManual.getAppenders().size());
+
+ msg = new StructuredDataMessage("5", "This is a test 5", "Service");
+ EventLogger.logEvent(msg);
+
+ assertEquals("Incorrect number of appenders with manual purge.", 1, routingAppenderManual.getAppenders().size());
+
+ routingAppenderManual.deleteAppender("5");
+ routingAppenderManual.deleteAppender("5");
+
+ assertEquals("Incorrect number of appenders with manual purge.", 0, routingAppenderManual.getAppenders().size());
}
- private void assertFileExistance(final String... files) {
- for (final String file : files) {
- assertTrue("File should exist - " + file + " file ", new File(file).exists());
- }
+
+ private void assertFileExistance(String... files) {
+ for (String file : files) {
+ assertTrue("File should exist - " + file + " file ", new File(file).exists());
+ }
}
}
[08/50] logging-log4j2 git commit: Remove
@SuppressWarnings("unchecked").
Posted by ma...@apache.org.
Remove @SuppressWarnings("unchecked").
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7ad14899
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7ad14899
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7ad14899
Branch: refs/heads/feature/LOG4J2-1430
Commit: 7ad148998719f81148f047128bc5af66737884b2
Parents: 370ea6c
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:48:33 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:48:33 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7ad14899/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
index 5209be2..2f597b5 100644
--- a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
+++ b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
@@ -61,7 +61,6 @@ public class NoSqlDatabaseManagerTest {
public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule();
@Before
- @SuppressWarnings("unchecked")
public void setUp() {
this.provider = createStrictMock(NoSqlProvider.class);
this.connection = createStrictMock(NoSqlConnection.class);
[36/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1553
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/master' into LOG4J2-1553
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8bc69221
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8bc69221
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8bc69221
Branch: refs/heads/feature/LOG4J2-1430
Commit: 8bc692211e3ea19b7cbb4918a6620be2c2a589a4
Parents: a0d08f3 114e687
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 09:02:15 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 09:02:15 2016 -0700
----------------------------------------------------------------------
README.md | 8 ++
log4j-1.2-api/pom.xml | 4 -
.../config/Log4j1ConfigurationConverter.java | 41 ++++++
.../config/Log4j1ConfigurationFactory.java | 1 -
.../log4j/config/Log4j1ConfigurationParser.java | 20 +--
.../apache/log4j/layout/Log4j1XmlLayout.java | 4 +-
.../pattern/Log4j1NdcPatternConverter.java | 4 +-
.../org/apache/logging/log4j/util/Strings.java | 63 +++++++++
log4j-core/pom.xml | 10 ++
.../builder/api/ConfigurationBuilder.java | 16 +++
.../impl/DefaultConfigurationBuilder.java | 129 +++++++++++++++++++
.../RollingAppenderCronOnceADayTest.java | 2 +-
.../builder/ConfigurationBuilderTest.java | 91 +++++++++++++
pom.xml | 12 ++
src/changes/changes.xml | 3 +
15 files changed, 389 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[43/50] logging-log4j2 git commit: Add missing Javadoc @param
description text.
Posted by ma...@apache.org.
Add missing Javadoc @param description text.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4dfcb20e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4dfcb20e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4dfcb20e
Branch: refs/heads/feature/LOG4J2-1430
Commit: 4dfcb20ec5821523d7034f0401d4a021f4e13897
Parents: c6ecfc4
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 13:40:08 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 13:40:08 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/net/TcpSocketManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4dfcb20e/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
index e4bb1a5..756ba35 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
@@ -73,7 +73,7 @@ public class TcpSocketManager extends AbstractSocketManager {
* @param port The port number on the host.
* @param connectTimeoutMillis the connect timeout in milliseconds.
* @param delay Reconnection interval.
- * @param immediateFail
+ * @param immediateFail True if the write should fail if no socket is immediately available.
* @param layout The Layout.
*/
public TcpSocketManager(final String name, final OutputStream os, final Socket sock, final InetAddress inetAddress,
[46/50] logging-log4j2 git commit: Better lvar name.
Posted by ma...@apache.org.
Better lvar name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a1896875
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a1896875
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a1896875
Branch: refs/heads/feature/LOG4J2-1430
Commit: a18968757e8644d2b0c3356f16d35a555138657e
Parents: ba49c96
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 15:07:52 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 15:07:52 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/appender/FileManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a1896875/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
index 33a2300..ebcb008 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
@@ -259,10 +259,10 @@ public class FileManager extends OutputStreamManager {
final boolean writeHeader = !data.append || !file.exists();
try {
final int actualSize = data.bufferedIO ? data.bufferSize : Constants.ENCODER_BYTE_BUFFER_SIZE;
- final ByteBuffer buffer = ByteBuffer.wrap(new byte[actualSize]);
+ final ByteBuffer byteBuffer = ByteBuffer.wrap(new byte[actualSize]);
final FileOutputStream fos = data.createOnDemand ? null : new FileOutputStream(file, data.append);
return new FileManager(data.getLoggerContext(), name, fos, data.append, data.locking,
- data.createOnDemand, data.advertiseURI, data.layout, writeHeader, buffer);
+ data.createOnDemand, data.advertiseURI, data.layout, writeHeader, byteBuffer);
} catch (final IOException ex) {
LOGGER.error("FileManager (" + name + ") " + ex, ex);
}
[22/50] logging-log4j2 git commit: Group "add"s together.
Posted by ma...@apache.org.
Group "add"s together.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/daa67767
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/daa67767
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/daa67767
Branch: refs/heads/feature/LOG4J2-1430
Commit: daa6776713964e94942622b7fdc0fabca94bdb2f
Parents: 8968716
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 11:38:26 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 11:38:26 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/daa67767/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 108d75a..6a12f64 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,12 +24,6 @@
</properties>
<body>
<release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
- <action issue="LOG4J2-1181" dev="mikes" type="add">
- Scala API.
- </action>
- <action issue="LOG4J2-1512" dev="mikes" type="add">
- Options to exclude stack trace from JSON, XML and YAML layouts.
- </action>
<action issue="LOG4J2-1511" dev="ggregory" type="fix" due-to="Srikanth Surukuntu">
DynamicThresholdFilter filters incorrectly when params are passed as individual arguments instead of varargs.
</action>
@@ -102,6 +96,12 @@
<action issue="LOG4J2-1313" dev="rpopma" type="fix" due-to="Philipp Knobel">
Properties declared in configuration can now have their value either in the element body or in an attribute named "value".
</action>
+ <action issue="LOG4J2-1181" dev="mikes" type="add">
+ Scala API.
+ </action>
+ <action issue="LOG4J2-1512" dev="mikes" type="add">
+ Options to exclude stack trace from JSON, XML and YAML layouts.
+ </action>
<action issue="LOG4J2-1539" dev="ggregory" type="add" due-to="Gary Gregory">
Add Core API Configurator.shutdown(LoggerContext, long, TimeUnit).
</action>
[50/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into feature/LOG4J2-1430
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/master' into feature/LOG4J2-1430
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/41ea561f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/41ea561f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/41ea561f
Branch: refs/heads/feature/LOG4J2-1430
Commit: 41ea561fb817c39d83a8dc95be5676a0ab8cc30a
Parents: 849fdb8 1dc04f8
Author: Matt Sicker <bo...@gmail.com>
Authored: Thu Sep 1 11:32:26 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Thu Sep 1 11:32:26 2016 -0500
----------------------------------------------------------------------
.gitignore | 14 +-
README.md | 8 +
log4j-1.2-api/.gitignore | 5 -
log4j-1.2-api/pom.xml | 1 +
.../config/Log4j1ConfigurationConverter.java | 41 +
.../config/Log4j1ConfigurationFactory.java | 280 +--
.../log4j/config/Log4j1ConfigurationParser.java | 329 ++++
.../apache/log4j/layout/Log4j1XmlLayout.java | 161 ++
.../pattern/Log4j1MdcPatternConverter.java | 91 +
.../pattern/Log4j1NdcPatternConverter.java | 63 +
.../apache/log4j/BasicConfigurationFactory.java | 13 +-
.../config/Log4j1ConfigurationFactoryTest.java | 64 +-
.../log4j/layout/Log4j1XmlLayoutTest.java | 84 +
.../pattern/Log4j1MdcPatternConverterTest.java | 79 +
.../pattern/Log4j1NdcPatternConverterTest.java | 74 +
...g4j-console-EnhancedPatternLayout.properties | 3 +-
.../log4j-console-HtmlLayout.properties | 3 +-
.../log4j-console-PatternLayout.properties | 1 -
.../log4j-console-SimpleLayout.properties | 1 -
.../log4j-console-TTCCLayout.properties | 3 +-
.../log4j-console-XmlLayout.properties | 5 +-
.../log4j-file-SimpleLayout.properties | 17 +
log4j-api-scala_2.10/pom.xml | 150 ++
.../org/apache/logging/log4j/scala/Logger.scala | 592 ++++++
.../logging/log4j/scala/LoggerMacro.scala | 425 +++++
.../apache/logging/log4j/scala/Logging.scala | 30 +
.../apache/logging/log4j/scala/LoggerTest.scala | 550 ++++++
log4j-api-scala_2.11/pom.xml | 150 ++
.../org/apache/logging/log4j/scala/Logger.scala | 592 ++++++
.../logging/log4j/scala/LoggerMacro.scala | 425 +++++
.../apache/logging/log4j/scala/Logging.scala | 30 +
.../apache/logging/log4j/scala/LoggerTest.scala | 550 ++++++
log4j-api/.gitignore | 5 -
.../logging/log4j/CloseableThreadContext.java | 2 +-
.../java/org/apache/logging/log4j/Logger.java | 20 +
.../org/apache/logging/log4j/ThreadContext.java | 66 +-
.../logging/log4j/message/ObjectMessage.java | 10 +
.../log4j/message/ReusableObjectMessage.java | 10 +
.../log4j/spi/DefaultThreadContextMap.java | 18 +-
.../logging/log4j/spi/ThreadContextMap.java | 63 +-
.../logging/log4j/spi/ThreadContextMap2.java | 40 +
.../logging/log4j/spi/ThreadContextStack.java | 1 +
.../apache/logging/log4j/util/Constants.java | 1 +
.../apache/logging/log4j/util/LoaderUtil.java | 28 +-
.../org/apache/logging/log4j/util/Strings.java | 63 +
.../org/apache/logging/log4j/util/Unbox.java | 1 +
.../log4j/CloseableThreadContextTest.java | 11 +-
.../org/apache/logging/log4j/LoggerTest.java | 2 +-
.../logging/log4j/ThreadContextHolder.java | 79 +
.../apache/logging/log4j/ThreadContextTest.java | 21 +
.../apache/logging/log4j/TraceLoggingTest.java | 1 -
.../logging/log4j/junit/BundleTestInfo.java | 137 +-
.../apache/logging/log4j/junit/OsgiRule.java | 141 +-
.../log4j/junit/ThreadContextMapRule.java | 37 +
.../logging/log4j/junit/ThreadContextRule.java | 78 +
.../log4j/junit/ThreadContextStackRule.java | 37 +
.../log4j/spi/DefaultThreadContextMapTest.java | 26 +-
log4j-bom/.gitignore | 3 -
log4j-bom/pom.xml | 12 +
log4j-core/.gitignore | 5 -
log4j-core/pom.xml | 22 +-
.../logging/log4j/core/AbstractLifeCycle.java | 8 +
.../apache/logging/log4j/core/LifeCycle.java | 13 +
.../logging/log4j/core/LoggerContext.java | 153 +-
.../log4j/core/appender/AbstractAppender.java | 58 +
.../log4j/core/appender/AbstractManager.java | 60 +-
.../appender/AbstractOutputStreamAppender.java | 23 +-
.../core/appender/AbstractWriterAppender.java | 2 +-
.../log4j/core/appender/AsyncAppender.java | 3 +-
.../core/appender/ConfigurationFactoryData.java | 50 +
.../log4j/core/appender/ConsoleAppender.java | 84 +-
.../log4j/core/appender/FileAppender.java | 292 ++-
.../log4j/core/appender/FileManager.java | 101 +-
.../core/appender/MemoryMappedFileManager.java | 8 +-
.../core/appender/OutputStreamManager.java | 75 +-
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../core/appender/RandomAccessFileManager.java | 31 +-
.../core/appender/RollingFileAppender.java | 597 ++++--
.../RollingRandomAccessFileAppender.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 3 +-
.../log4j/core/appender/WriterManager.java | 6 +-
.../appender/db/AbstractDatabaseAppender.java | 4 +-
.../appender/db/AbstractDatabaseManager.java | 8 +-
.../appender/db/jdbc/JdbcDatabaseManager.java | 4 +-
.../appender/db/jpa/JpaDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsAppender.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 4 +-
.../appender/mom/jeromq/JeroMqAppender.java | 362 ++--
.../core/appender/mom/jeromq/JeroMqManager.java | 2 +-
.../core/appender/mom/kafka/KafkaAppender.java | 9 +-
.../core/appender/mom/kafka/KafkaManager.java | 185 +-
.../rolling/DefaultRolloverStrategy.java | 10 +-
.../log4j/core/appender/rolling/FileSize.java | 1 +
.../appender/rolling/RollingFileManager.java | 74 +-
.../rolling/RollingRandomAccessFileManager.java | 38 +-
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../rolling/action/FileRenameAction.java | 1 -
.../core/appender/routing/IdlePurgePolicy.java | 57 +-
.../core/appender/routing/RoutingAppender.java | 35 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 3 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 3 +-
.../log4j/core/async/DaemonThreadFactory.java | 53 -
.../log4j/core/async/RingBufferLogEvent.java | 6 +-
.../core/config/AbstractConfiguration.java | 42 +-
.../log4j/core/config/AppenderControl.java | 3 +-
.../log4j/core/config/AppendersPlugin.java | 4 +-
.../log4j/core/config/Configuration.java | 8 +
.../log4j/core/config/ConfigurationFactory.java | 86 +-
.../core/config/ConfigurationScheduler.java | 23 +-
.../core/config/ConfiguratonFileWatcher.java | 10 +-
.../logging/log4j/core/config/Configurator.java | 36 +-
.../log4j/core/config/DefaultConfiguration.java | 2 +-
.../logging/log4j/core/config/LoggerConfig.java | 36 +-
.../log4j/core/config/NullConfiguration.java | 2 +-
.../core/config/builder/api/Component.java | 4 +-
.../builder/api/ConfigurationBuilder.java | 36 +-
.../config/builder/impl/BuiltConfiguration.java | 5 +-
.../builder/impl/DefaultComponentBuilder.java | 4 +-
.../impl/DefaultConfigurationBuilder.java | 181 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../composite/CompositeConfiguration.java | 4 +-
.../config/composite/DefaultMergeStrategy.java | 7 +-
.../core/config/json/JsonConfiguration.java | 14 +-
.../config/json/JsonConfigurationFactory.java | 5 +-
.../config/plugins/PluginBuilderFactory.java | 1 +
.../config/plugins/PluginConfiguration.java | 1 +
.../core/config/plugins/PluginFactory.java | 2 +-
.../log4j/core/config/plugins/PluginNode.java | 1 +
.../core/config/plugins/util/PluginBuilder.java | 6 +-
.../config/plugins/util/PluginRegistry.java | 1 -
.../core/config/plugins/util/ResolverUtil.java | 13 +-
.../plugins/visitors/PluginValueVisitor.java | 5 +-
.../properties/PropertiesConfiguration.java | 8 +-
.../PropertiesConfigurationBuilder.java | 18 +-
.../PropertiesConfigurationFactory.java | 13 +-
.../log4j/core/config/xml/XmlConfiguration.java | 47 +-
.../config/xml/XmlConfigurationFactory.java | 6 +-
.../core/config/yaml/YamlConfiguration.java | 7 +-
.../config/yaml/YamlConfigurationFactory.java | 5 +-
.../log4j/core/filter/AbstractFilterable.java | 27 +
.../core/filter/DynamicThresholdFilter.java | 85 +-
.../log4j/core/impl/DefaultLogEventFactory.java | 7 +-
.../log4j/core/impl/ExtendedClassInfo.java | 23 +-
.../core/impl/ExtendedStackTraceElement.java | 46 +-
.../log4j/core/impl/Log4jContextFactory.java | 6 +-
.../log4j/core/impl/ThrowableFormatOptions.java | 541 +++---
.../logging/log4j/core/impl/ThrowableProxy.java | 1390 +++++++-------
.../log4j/core/jackson/Initializers.java | 10 +-
.../log4j/core/jackson/Log4jJsonModule.java | 9 +-
.../core/jackson/Log4jJsonObjectMapper.java | 6 +-
.../log4j/core/jackson/Log4jXmlModule.java | 6 +-
.../core/jackson/Log4jXmlObjectMapper.java | 9 +-
.../log4j/core/jackson/Log4jYamlModule.java | 9 +-
.../core/jackson/Log4jYamlObjectMapper.java | 6 +-
.../ThrowableProxyWithoutStacktraceMixIn.java | 77 +
.../log4j/core/jmx/LoggerContextAdmin.java | 4 +-
.../apache/logging/log4j/core/jmx/Server.java | 19 +-
.../log4j/core/layout/AbstractCsvLayout.java | 10 +-
.../log4j/core/layout/AbstractStringLayout.java | 57 +-
.../logging/log4j/core/layout/HtmlLayout.java | 14 +
.../log4j/core/layout/JacksonFactory.java | 22 +-
.../logging/log4j/core/layout/JsonLayout.java | 14 +-
.../log4j/core/layout/PatternLayout.java | 18 +-
.../logging/log4j/core/layout/XmlLayout.java | 15 +-
.../logging/log4j/core/layout/YamlLayout.java | 13 +-
.../logging/log4j/core/lookup/JndiLookup.java | 2 +-
.../logging/log4j/core/net/JndiManager.java | 2 +-
.../logging/log4j/core/net/SmtpManager.java | 4 +-
.../log4j/core/net/TcpSocketManager.java | 9 +-
.../core/net/server/AbstractSocketServer.java | 7 +-
.../log4j/core/net/server/JmsServer.java | 12 +-
.../server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/core/net/server/TcpSocketServer.java | 2 +-
.../core/pattern/DatePatternConverter.java | 2 +-
.../ExtendedThrowablePatternConverter.java | 3 +-
.../log4j/core/pattern/HighlightConverter.java | 38 +-
.../log4j/core/pattern/HtmlMessageRenderer.java | 33 -
.../log4j/core/pattern/HtmlTextRenderer.java | 38 +
.../core/pattern/JAnsiMessageRenderer.java | 205 ---
.../log4j/core/pattern/JAnsiTextRenderer.java | 332 ++++
.../core/pattern/MessagePatternConverter.java | 53 +-
.../log4j/core/pattern/MessageRenderer.java | 32 -
.../log4j/core/pattern/NameAbbreviator.java | 2 +
.../log4j/core/pattern/PlainTextRenderer.java | 40 +
.../pattern/RootThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/StyleConverter.java | 24 +-
.../log4j/core/pattern/TextRenderer.java | 46 +
.../log4j/core/script/ScriptManager.java | 1 -
.../core/selector/BasicContextSelector.java | 131 +-
.../core/selector/CoreContextSelectors.java | 25 +
.../core/selector/JndiContextSelector.java | 2 +-
.../logging/log4j/core/util/ArrayUtils.java | 124 ++
.../apache/logging/log4j/core/util/Assert.java | 38 -
.../logging/log4j/core/util/Constants.java | 11 -
.../util/DefaultShutdownCallbackRegistry.java | 7 +
.../apache/logging/log4j/core/util/Loader.java | 6 +-
.../logging/log4j/core/util/Log4jThread.java | 138 +-
.../log4j/core/util/Log4jThreadFactory.java | 99 +
.../logging/log4j/core/util/TypeUtil.java | 21 +
.../core/util/datetime/FastDateParser.java | 54 +-
.../core/util/datetime/FixedDateFormat.java | 77 +-
.../log4j/FormatterLoggerManualExample.java | 7 +-
.../apache/logging/log4j/LogRolloverTest.java | 18 +-
.../logging/log4j/MarkerMixInXmlTest.java | 2 +-
.../log4j/core/BasicConfigurationFactory.java | 6 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 1 -
.../ConsoleAppenderAnsiMessagesMain.java | 110 +-
.../ConsoleAppenderAnsiStyleJira180Main.java | 119 +-
.../ConsoleAppenderAnsiStyleJira272Main.java | 121 +-
.../ConsoleAppenderAnsiStyleJira319Main.java | 123 +-
.../ConsoleAppenderAnsiStyleLayoutMain.java | 149 +-
.../ConsoleAppenderAnsiStyleNameLayoutMain.java | 11 +-
...nsoleAppenderDefaultSuppressedThrowable.java | 131 +-
...nsoleAppenderHighlightLayoutDefaultMain.java | 11 +-
...nsoleAppenderHighlightLayoutLogbackMain.java | 11 +-
.../ConsoleAppenderHighlightLayoutMain.java | 11 +-
.../ConsoleAppenderJAnsiMessageMain.java | 160 +-
.../ConsoleAppenderJAnsiXExceptionMain.java | 76 +
.../ConsoleAppenderNoAnsiStyleLayoutMain.java | 145 +-
.../core/appender/ConsoleAppenderTest.java | 8 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 117 ++
.../log4j/core/appender/FileAppenderTest.java | 306 ++--
.../log4j/core/appender/Jira739Test.java | 103 +-
.../appender/JsonCompleteFileAppenderTest.java | 37 +-
.../appender/MemoryMappedFileManagerTest.java | 25 +-
.../core/appender/OutputStreamAppenderTest.java | 214 +--
.../core/appender/ProgressConsoleTest.java | 7 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../appender/RandomAccessFileManagerTest.java | 18 +-
.../appender/XmlCompleteFileAppenderTest.java | 68 +-
.../db/AbstractDatabaseAppenderTest.java | 10 +-
.../db/jdbc/AbstractJdbcAppenderTest.java | 14 +-
.../db/jpa/AbstractJpaAppenderTest.java | 14 +-
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +-
.../db/jpa/JpaHyperSqlAppenderTest.java | 28 +-
.../ContextStackJsonAttributeConverterTest.java | 19 +-
.../log4j/core/appender/mom/JmsAppenderIT.java | 2 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 10 +-
.../core/appender/rolling/FileSizeTest.java | 4 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 43 +-
.../RandomRollingAppenderOnStartupTest.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 125 ++
.../rolling/RollingAppenderCronTest.java | 9 +-
.../RollingAppenderCustomDeleteActionTest.java | 2 +-
...lingAppenderDeleteAccumulatedCount1Test.java | 2 +-
...lingAppenderDeleteAccumulatedCount2Test.java | 2 +-
...ollingAppenderDeleteAccumulatedSizeTest.java | 2 +-
.../RollingAppenderDeleteMaxDepthTest.java | 2 +-
.../RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 2 +-
.../RollingAppenderDeleteScriptTest.java | 2 +-
...ollingAppenderNoUnconditionalDeleteTest.java | 2 +-
.../rolling/RollingAppenderOnStartupTest.java | 2 +-
.../rolling/RollingAppenderSizeTest.java | 45 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 4 +-
.../rolling/RollingAppenderTimeTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 56 +-
...RandomAccessFileManagerHeaderFooterTest.java | 3 +-
.../RollingRandomAccessFileManagerTest.java | 24 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../core/async/RingBufferLogEventTest.java | 18 +-
.../core/config/CompositeConfigurationTest.java | 51 +-
.../log4j/core/config/ConfigurationTest.java | 8 +-
.../log4j/core/config/ConfiguratorTest.java | 5 +-
.../core/config/CustomConfigurationTest.java | 15 +-
.../core/config/MissingRootLoggerTest.java | 2 +-
.../log4j/core/config/TestConfigurator.java | 24 +-
.../core/config/TestConfiguratorError.java | 13 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../builder/ConfigurationAssemblerTest.java | 36 +-
.../builder/ConfigurationBuilderTest.java | 92 +
.../builder/CustomConfigurationFactory.java | 18 +-
.../plugins/util/PluginManagerPackagesTest.java | 12 +-
.../util/ResolverUtilCustomProtocolTest.java | 208 +++
.../config/plugins/util/ResolverUtilTest.java | 126 +-
.../AbstractPluginWithGenericBuilder.java | 59 +
.../PluginWithGenericSubclassFoo1Builder.java | 55 +
.../plugins/validation/ValidatingPlugin.java | 2 +-
.../ValidatingPluginWithGenericBuilder.java | 75 +
.../ValidatingPluginWithTypedBuilder.java | 70 +
.../validators/RequiredValidatorTest.java | 1 +
.../ValidatingPluginWithGenericBuilderTest.java | 66 +
...luginWithGenericSubclassFoo1BuilderTest.java | 68 +
.../ValidatingPluginWithTypedBuilderTest.java | 71 +
.../core/config/xml/XmlLoggerPropsTest.java | 8 +-
.../core/filter/DynamicThresholdFilterTest.java | 47 +-
.../core/impl/ThrowableFormatOptionsTest.java | 208 ++-
.../log4j/core/jackson/LevelMixInJsonTest.java | 2 +-
.../jackson/StackTraceElementMixInTest.java | 2 +-
.../core/layout/CsvLogEventLayoutTest.java | 8 +-
.../core/layout/CsvParameterLayoutTest.java | 73 +-
.../log4j/core/layout/GelfLayoutTest.java | 12 +-
.../log4j/core/layout/HtmlLayoutTest.java | 7 +-
.../log4j/core/layout/JsonLayoutTest.java | 59 +-
.../log4j/core/layout/Log4j2_1482_CoreTest.java | 20 +
.../log4j/core/layout/Log4j2_1482_Test.java | 89 +
.../log4j/core/layout/LogEventFixtures.java | 6 +-
.../layout/PatternLayoutLookupDateTest.java | 28 +
.../layout/PatternLayoutNoLookupDateTest.java | 26 +
.../log4j/core/layout/PatternLayoutTest.java | 18 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 21 +-
.../log4j/core/layout/SerializedLayoutTest.java | 7 +-
.../log4j/core/layout/SyslogLayoutTest.java | 9 +-
.../log4j/core/layout/XmlLayoutTest.java | 66 +-
.../log4j/core/layout/YamlLayoutTest.java | 55 +-
.../lookup/MainInputArgumentsLookupTest.java | 11 +-
.../net/server/AbstractSocketServerTest.java | 4 +-
.../osgi/equinox/EquinoxLoadCoreBundleTest.java | 6 +-
.../osgi/felix/FelixLoadCoreBundleTest.java | 4 +
.../core/pattern/DatePatternConverterTest.java | 22 +
.../core/pattern/HighlightConverterTest.java | 78 +
.../core/pattern/MdcPatternConverterTest.java | 29 +-
.../pattern/MessagePatternConverterTest.java | 197 +-
.../core/pattern/NdcPatternConverterTest.java | 77 +
.../core/pattern/RegexReplacementTest.java | 17 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../core/util/datetime/FixedDateFormatTest.java | 35 +-
.../junit/AbstractExternalFileCleaner.java | 232 ++-
.../apache/logging/log4j/junit/CleanFiles.java | 38 +-
.../logging/log4j/junit/CleanFolders.java | 59 +-
.../logging/log4j/junit/LoggerContextRule.java | 51 +-
.../junit/URLStreamHandlerFactoryRule.java | 96 +
.../log4j/test/appender/InMemoryAppender.java | 7 +-
log4j-core/src/test/resources/gcFreeLogging.xml | 11 +-
.../resources/gcFreeMixedSyncAsyncLogging.xml | 10 +-
.../log4j-comp-logger-attr-override.json | 38 +
.../test/resources/log4j-comp-logger-root.xml | 44 +
.../test/resources/log4j-comp-root-loggers.xml | 46 +
.../test/resources/log4j-cvs-json-parameter.xml | 32 +
.../src/test/resources/log4j-list-nolookups.xml | 29 +
.../src/test/resources/log4j-loggerprops.xml | 4 +-
.../test/resources/log4j-rolling-7z-lazy.xml | 59 +
.../test/resources/log4j-rolling-bzip2-lazy.xml | 60 +
.../resources/log4j-rolling-cron-once-a-day.xml | 47 +
.../src/test/resources/log4j-rolling-cron.xml | 2 +-
.../src/test/resources/log4j-rolling-cron2.xml | 2 +-
.../resources/log4j-rolling-deflate-lazy.xml | 60 +
.../test/resources/log4j-rolling-gz-lazy.xml | 59 +
.../resources/log4j-rolling-pack200-lazy.xml | 60 +
.../test/resources/log4j-rolling-xz-lazy.xml | 60 +
.../test/resources/log4j-rolling-zip-lazy.xml | 60 +
log4j-core/src/test/resources/log4j-style.xml | 4 +-
log4j-core/src/test/resources/log4j2-1482.xml | 27 +
.../log4j2-console-xex-ansi-custom.xml | 31 +
.../resources/log4j2-console-xex-ansi-kirk.xml | 31 +
.../test/resources/log4j2-console-xex-ansi.xml | 31 +
.../test/resources/log4j2-properties.properties | 1 +
log4j-distribution/.gitignore | 2 -
log4j-flume-ng/.gitignore | 4 -
log4j-flume-ng/pom.xml | 1 +
.../flume/appender/AbstractFlumeManager.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 43 +-
.../flume/appender/FlumePersistentManager.java | 1730 +++++++++---------
.../log4j/flume/appender/FlumeAppenderTest.java | 49 +-
log4j-iostreams/.gitignore | Bin 69 -> 0 bytes
log4j-jcl/.gitignore | 4 -
log4j-jmx-gui/.gitignore | 4 -
log4j-jmx-gui/pom.xml | 1 +
log4j-jul/.gitignore | 3 -
log4j-jul/pom.xml | 1 +
log4j-liquibase/.gitignore | 3 -
log4j-nosql/.gitignore | 4 -
log4j-nosql/pom.xml | 6 +
.../appender/NoSqlDatabaseManagerTest.java | 86 +-
log4j-perf/.gitignore | 4 -
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 4 +-
.../log4j/perf/jmh/JpaAppenderBenchmark.java | 4 +-
log4j-samples/.gitignore | 5 -
.../configuration/CustomConfiguration.java | 13 +-
.../CustomConfigurationFactory.java | 12 +-
log4j-samples/pom.xml | 1 +
log4j-samples/scala-api/.gitignore | 3 +
log4j-samples/scala-api/pom.xml | 65 +
.../scala-api/src/main/resources/log4j2.xml | 32 +
.../logging/log4j/scalasample/LoggingApp.scala | 31 +
log4j-slf4j-impl/.gitignore | 4 -
log4j-slf4j-impl/pom.xml | 5 +
.../org/apache/logging/slf4j/Log4j1222Test.java | 1 -
.../logging/slf4j/Log4j2_1482_Slf4jTest.java | 41 +
.../src/test/resources/log4j2-1482.xml | 27 +
log4j-taglib/.gitignore | 4 -
log4j-to-slf4j/.gitignore | 4 -
.../org/apache/logging/slf4j/MDCContextMap.java | 12 +-
log4j-web/.gitignore | 4 -
log4j-web/pom.xml | 1 +
.../org/apache/logging/log4j/web/WebLookup.java | 8 -
pom.xml | 40 +-
src/changes/announcement.vm | 15 +-
src/changes/changes.xml | 184 +-
src/site/site.xml | 3 +
src/site/xdoc/manual/appenders.xml | 39 +-
src/site/xdoc/manual/configuration.xml.vm | 6 +-
src/site/xdoc/manual/customconfig.xml | 10 +-
src/site/xdoc/manual/extending.xml | 22 +-
src/site/xdoc/manual/garbagefree.xml | 10 +-
src/site/xdoc/manual/layouts.xml.vm | 87 +-
src/site/xdoc/manual/lookups.xml | 18 +-
src/site/xdoc/manual/scala-api.xml | 91 +
src/site/xdoc/maven-artifacts.xml.vm | 28 +
src/site/xdoc/runtime-dependencies.xml | 7 +
405 files changed, 16044 insertions(+), 5920 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/log4j-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 200a5b4,7b6e985..d23116f
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@@ -39,13 -37,13 +39,14 @@@ import org.apache.logging.log4j.core.co
import org.apache.logging.log4j.core.config.ConfigurationException;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAliases;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.util.Constants;
+ import org.apache.logging.log4j.core.util.Log4jThread;
/**
* Appends to one or more Appenders asynchronously. You can configure an AsyncAppender with one or more Appenders and an
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
index e3c5140,dfaf78c..9e88c09
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Loader.java
@@@ -308,6 -307,19 +307,11 @@@ public final class Loader
* @return {@code true} if the class could be found or {@code false} otherwise.
*/
public static boolean isClassAvailable(final String className) {
- try {
- final Class<?> clazz = loadClass(className);
- return clazz != null;
- } catch (final ClassNotFoundException e) {
- return false;
- } catch (final Throwable e) {
- LOGGER.trace("Unknown error checking for existence of class [{}].", className, e);
- return false;
- }
+ return LoaderUtil.isClassAvailable(className);
}
+
+ public static boolean isJansiAvailable() {
+ return isClassAvailable("org.fusesource.jansi.AnsiRenderer");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
----------------------------------------------------------------------
diff --cc log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
index 66f1801,b3ec1e0..dccebb4
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
@@@ -16,6 -16,10 +16,8 @@@
*/
package org.apache.logging.log4j.junit;
-import static org.junit.Assert.assertNotNull;
-
+ import java.util.concurrent.TimeUnit;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Logger;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ae5ac17,99ce0b8..b5eddd1
--- a/pom.xml
+++ b/pom.xml
@@@ -192,11 -192,10 +192,11 @@@
<slf4jVersion>1.7.21</slf4jVersion>
<logbackVersion>1.1.7</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
- <jackson2Version>2.8.0</jackson2Version>
+ <jackson2Version>2.8.1</jackson2Version>
<springVersion>3.2.13.RELEASE</springVersion>
<flumeVersion>1.6.0</flumeVersion>
- <disruptorVersion>3.3.4</disruptorVersion>
+ <disruptorVersion>3.3.5</disruptorVersion>
+ <conversantDisruptorVersion>1.2.7</conversantDisruptorVersion>
<compiler.plugin.version>3.5.1</compiler.plugin.version>
<pmd.plugin.version>3.6</pmd.plugin.version>
<findbugs.plugin.version>3.0.3</findbugs.plugin.version>
@@@ -222,10 -221,9 +222,10 @@@
<projectDir />
<commonsLoggingVersion>1.2</commonsLoggingVersion>
<osgi.api.version>4.3.1</osgi.api.version>
- <activemq.version>5.13.3</activemq.version>
+ <activemq.version>5.14.0</activemq.version>
<!-- Allow Clirr severity to be overriden by the command-line option -DminSeverity=level -->
<minSeverity>info</minSeverity>
+ <jctoolsVersion>1.2.1</jctoolsVersion>
</properties>
<pluginRepositories>
<pluginRepository>
@@@ -634,6 -632,12 +644,12 @@@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.24</version>
+ <scope>test</scope>
- </dependency>
++ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.4</version>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/41ea561f/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
[11/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ".
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/debb8ec1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/debb8ec1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/debb8ec1
Branch: refs/heads/feature/LOG4J2-1430
Commit: debb8ec1ca84e3a362c688b796df4aa45d25e1af
Parents: 629edaa
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 14:31:08 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 14:31:08 2016 -0700
----------------------------------------------------------------------
.../CsvJsonParameterLayoutFileAppenderTest.java | 71 ++++++++++++++++++++
.../test/resources/log4j-cvs-json-parameter.xml | 34 ++++++++++
2 files changed, 105 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/debb8ec1/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
new file mode 100644
index 0000000..851e692
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+
+package org.apache.logging.log4j.core.appender;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+import com.google.common.io.Files;
+
+public class CsvJsonParameterLayoutFileAppenderTest {
+
+ private static final String FILE_PATH = "target/CsvJsonParameterLayoutFileAppenderTest.log";
+
+ private static final LoggerContextRule loggerContextRule = new LoggerContextRule("log4j-cvs-json-parameter.xml");
+
+ @Rule
+ public RuleChain rule = loggerContextRule.withCleanFilesRule(FILE_PATH);
+
+ @Test
+ @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
+ public void testNoNulCharacters() throws IOException {
+ @SuppressWarnings("resource")
+ final LoggerContext loggerContext = loggerContextRule.getLoggerContext();
+ final Logger logger = loggerContext.getLogger("com.example");
+ final String json = "{\"id\":10,\"name\":\"Alice\"}";
+ logger.error("log:", json);
+ loggerContext.stop();
+ final File file = new File(FILE_PATH);
+ final byte[] contents = Files.toByteArray(file);
+ int count0s = 0;
+ final StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < contents.length; i++) {
+ final byte b = contents[i];
+ if (b == 0) {
+ sb.append(i);
+ sb.append(", ");
+ count0s++;
+ }
+ }
+ Assert.assertEquals("File contains at least one 0x00 byte at indices " + sb, 0, count0s);
+ final List<String> readLines = Files.readLines(file, Charset.defaultCharset());
+ final String actual = readLines.get(0);
+ Assert.assertTrue(actual, actual.contains(json));
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/debb8ec1/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml b/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
new file mode 100644
index 0000000..f47f69e
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<Configuration status="warn" name="CsvJsonParameterLayoutFileAppenderTest">
+ <Appenders>
+ <File name="File" fileName="target/CsvJsonParameterLayoutFileAppenderTest.log" bufferedIO="false">
+ <CsvParameterLayout delimiter=",">
+ </CsvParameterLayout>
+ </File>
+ </Appenders>
+
+ <Loggers>
+
+ <Root level="error">
+ <AppenderRef ref="File"/>
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file
[38/50] logging-log4j2 git commit: No need to nest an else clause.
Posted by ma...@apache.org.
No need to nest an else clause.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/379b6ea3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/379b6ea3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/379b6ea3
Branch: refs/heads/feature/LOG4J2-1430
Commit: 379b6ea3ca1427f1b503541f10f2d245403ea075
Parents: 6ac5219
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 09:28:26 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 09:28:26 2016 -0700
----------------------------------------------------------------------
.../core/config/builder/impl/DefaultConfigurationBuilder.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/379b6ea3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
index b9e8de5..4319515 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
@@ -205,9 +205,8 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
} catch (XMLStreamException e) {
if (e.getNestedException() instanceof IOException) {
throw (IOException)e.getNestedException();
- } else {
- throw new RuntimeException(e);
}
+ throw new RuntimeException(e);
}
}
[25/50] logging-log4j2 git commit: [LOG4J2-1502] CsvParameterLayout
and CsvLogEventLayout insert NUL characters if data starts with {, (, [ or "
Posted by ma...@apache.org.
[LOG4J2-1502] CsvParameterLayout and CsvLogEventLayout insert NUL
characters if data starts with {, (, [ or "
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b46c23c9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b46c23c9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b46c23c9
Branch: refs/heads/feature/LOG4J2-1430
Commit: b46c23c9c6e4e272a747356aef94edc3e9e4bcdc
Parents: f9a5d55
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 12:50:11 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 12:50:11 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b46c23c9/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 10be4c8..672e23d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -100,7 +100,7 @@
org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working correctly.
</action>
<action issue="LOG4J2-1502" dev="ggregory" type="fix" due-to="Sumit Singhal">
- CsvParameterLayout is inserting NUL character if data starts with {, (, [ or "
+ CsvParameterLayout and CsvLogEventLayout insert NUL characters if data starts with {, (, [ or "
</action>
<action issue="LOG4J2-1181" dev="mikes" type="add">
Scala API.
[31/50] logging-log4j2 git commit: Fix XML test
Posted by ma...@apache.org.
Fix XML test
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2c0b7db4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2c0b7db4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2c0b7db4
Branch: refs/heads/feature/LOG4J2-1430
Commit: 2c0b7db454a6a991f68e161b99acd698d29be010
Parents: eb82f77
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Aug 30 14:57:50 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Aug 30 14:57:50 2016 +0200
----------------------------------------------------------------------
log4j-core/pom.xml | 10 ++++++++++
.../core/config/builder/ConfigurationBuilderTest.java | 5 +++--
pom.xml | 12 ++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2c0b7db4/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 87a66c2..4d6f231 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -262,6 +262,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2c0b7db4/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 87ecd26..4083f52 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -24,8 +24,9 @@ import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory;
import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
import org.junit.Test;
+import org.xmlunit.matchers.CompareMatcher;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
public class ConfigurationBuilderTest {
@@ -84,7 +85,7 @@ public class ConfigurationBuilderTest {
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
addTestFixtures("config name", builder);
final String xmlConfiguration = builder.toXmlConfiguration();
- assertEquals(expectedXml, xmlConfiguration);
+ assertThat(xmlConfiguration, CompareMatcher.isIdenticalTo(expectedXml));
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2c0b7db4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5fd30d3..99ce0b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -731,6 +731,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ <version>2.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-matchers</artifactId>
+ <version>2.2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
[29/50] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1528
Posted by ma...@apache.org.
Merge branch 'master' into LOG4J2-1528
# Conflicts:
# src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/45a7da2d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/45a7da2d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/45a7da2d
Branch: refs/heads/feature/LOG4J2-1430
Commit: 45a7da2d27df625855f3b0529a716ee931cd987f
Parents: ea90a31 ef321c1
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Aug 30 11:26:58 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Aug 30 11:26:58 2016 +0200
----------------------------------------------------------------------
.../core/appender/routing/IdlePurgePolicy.java | 57 ++++++---
.../core/appender/routing/RoutingAppender.java | 35 +++---
.../log4j/core/layout/AbstractCsvLayout.java | 10 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 117 +++++++++++++++++++
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../db/jdbc/AbstractJdbcAppenderTest.java | 12 +-
.../db/jpa/AbstractJpaAppenderTest.java | 12 +-
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +++--
.../db/jpa/JpaHyperSqlAppenderTest.java | 28 +++--
.../RollingAppenderCronOnceADayTest.java | 4 +-
.../rolling/RollingAppenderCronTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +++-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../log4j/core/config/ConfigurationTest.java | 2 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../core/config/MissingRootLoggerTest.java | 2 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 22 ++--
.../test/resources/log4j-cvs-json-parameter.xml | 32 +++++
log4j-samples/scala-api/.gitignore | 3 +
src/site/xdoc/maven-artifacts.xml.vm | 28 +++++
27 files changed, 318 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
[35/50] logging-log4j2 git commit: Format nit.
Posted by ma...@apache.org.
Format nit.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/114e6878
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/114e6878
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/114e6878
Branch: refs/heads/feature/LOG4J2-1430
Commit: 114e68783f4a2ebe027a4a09df6b49ab029b8810
Parents: 2e2dc8e
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 08:26:16 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 08:26:16 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/log4j/config/Log4j1ConfigurationConverter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/114e6878/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
index ed6a02f..ab09f4b 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
@@ -32,7 +32,7 @@ public final class Log4j1ConfigurationConverter {
public static void main(String[] args) throws IOException {
try (InputStream input = args.length > 0 ? new FileInputStream(args[0]) : System.in;
- OutputStream output = args.length > 1 ? new FileOutputStream(args[1]) : System.out) {
+ OutputStream output = args.length > 1 ? new FileOutputStream(args[1]) : System.out) {
ConfigurationBuilder<BuiltConfiguration> builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(input);
builder.writeXmlConfiguration(output);
}
[02/50] logging-log4j2 git commit: Use try-with-resources for JDBC
resources.
Posted by ma...@apache.org.
Use try-with-resources for JDBC resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c4962aa3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c4962aa3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c4962aa3
Branch: refs/heads/feature/LOG4J2-1430
Commit: c4962aa3ba7decccdd4338b6763b3123d68045b3
Parents: 11930be
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:32:42 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:32:42 2016 -0700
----------------------------------------------------------------------
.../core/appender/db/jdbc/AbstractJdbcAppenderTest.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c4962aa3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
index 2d5f6ce..4d8cda9 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
@@ -83,18 +83,8 @@ public abstract class AbstractJdbcAppenderTest {
context.reconfigure();
StatusLogger.getLogger().reset();
- Statement statement = null;
- try {
- statement = this.connection.createStatement();
+ try (Statement statement = this.connection.createStatement()) {
statement.execute("SHUTDOWN");
- } finally {
- try {
- if (statement != null) {
- statement.close();
- }
- } catch (final SQLException ignore) {
- /* */
- }
}
this.connection.close();
[48/50] logging-log4j2 git commit: Simplify Git ignore file usage.
Posted by ma...@apache.org.
Simplify Git ignore file usage.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/878e8bce
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/878e8bce
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/878e8bce
Branch: refs/heads/feature/LOG4J2-1430
Commit: 878e8bcea83e471e502bffac2b7e1df7a80b66a5
Parents: fa1fd11
Author: ggregory <gg...@apache.org>
Authored: Thu Sep 1 08:13:15 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Sep 1 08:13:15 2016 -0700
----------------------------------------------------------------------
.gitignore | 3 +++
log4j-1.2-api/.gitignore | 5 -----
log4j-api-scala_2.10/.gitignore | 3 ---
log4j-api/.gitignore | 5 -----
log4j-bom/.gitignore | 3 ---
log4j-core/.gitignore | 6 ------
log4j-distribution/.gitignore | 2 --
log4j-flume-ng/.gitignore | 4 ----
log4j-iostreams/.gitignore | Bin 69 -> 0 bytes
log4j-jcl/.gitignore | 4 ----
log4j-jmx-gui/.gitignore | 4 ----
log4j-jul/.gitignore | 3 ---
log4j-liquibase/.gitignore | 3 ---
log4j-nosql/.gitignore | 4 ----
log4j-perf/.gitignore | 4 ----
log4j-samples/.gitignore | 5 -----
log4j-slf4j-impl/.gitignore | 4 ----
log4j-taglib/.gitignore | 4 ----
log4j-to-slf4j/.gitignore | 4 ----
log4j-web/.gitignore | 4 ----
20 files changed, 3 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9ba0860..3d542f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ target/
.classpath
.cache-main
.cache-tests
+velocity.log
+felix-cache/
+bin/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-1.2-api/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/.gitignore b/log4j-1.2-api/.gitignore
deleted file mode 100644
index ae5f6c6..0000000
--- a/log4j-1.2-api/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
-/velocity.log
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-api-scala_2.10/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.10/.gitignore b/log4j-api-scala_2.10/.gitignore
deleted file mode 100644
index ddd6d6d..0000000
--- a/log4j-api-scala_2.10/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.settings/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-api/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-api/.gitignore b/log4j-api/.gitignore
deleted file mode 100644
index 4a239e5..0000000
--- a/log4j-api/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
-/felix-cache/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-bom/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-bom/.gitignore b/log4j-bom/.gitignore
deleted file mode 100644
index 358cc65..0000000
--- a/log4j-bom/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target/
-/.project
-/.settings/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-core/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-core/.gitignore b/log4j-core/.gitignore
deleted file mode 100644
index 040a346..0000000
--- a/log4j-core/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
-/bin/
-/felix-cache/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-distribution/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-distribution/.gitignore b/log4j-distribution/.gitignore
deleted file mode 100644
index 58c32c8..0000000
--- a/log4j-distribution/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.project
-/.settings/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-flume-ng/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/.gitignore b/log4j-flume-ng/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-flume-ng/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-iostreams/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-iostreams/.gitignore b/log4j-iostreams/.gitignore
deleted file mode 100644
index b79adc7..0000000
Binary files a/log4j-iostreams/.gitignore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-jcl/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-jcl/.gitignore b/log4j-jcl/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-jcl/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-jmx-gui/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-jmx-gui/.gitignore b/log4j-jmx-gui/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-jmx-gui/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-jul/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-jul/.gitignore b/log4j-jul/.gitignore
deleted file mode 100644
index ddd6d6d..0000000
--- a/log4j-jul/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.settings/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-liquibase/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-liquibase/.gitignore b/log4j-liquibase/.gitignore
deleted file mode 100644
index fbdf7eb..0000000
--- a/log4j-liquibase/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.classpath
-/.project
-/.settings/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-nosql/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-nosql/.gitignore b/log4j-nosql/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-nosql/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-perf/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-perf/.gitignore b/log4j-perf/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-perf/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-samples/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-samples/.gitignore b/log4j-samples/.gitignore
deleted file mode 100644
index 7e7197b..0000000
--- a/log4j-samples/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target/
-/.project
-/configuration/target/
-/loggerProperties/target/
-/.settings/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-slf4j-impl/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/.gitignore b/log4j-slf4j-impl/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-slf4j-impl/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-taglib/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-taglib/.gitignore b/log4j-taglib/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-taglib/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-to-slf4j/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/.gitignore b/log4j-to-slf4j/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-to-slf4j/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/878e8bce/log4j-web/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-web/.gitignore b/log4j-web/.gitignore
deleted file mode 100644
index 9f0fc21..0000000
--- a/log4j-web/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
[10/50] logging-log4j2 git commit: Ignore Eclipse files and folders.
Posted by ma...@apache.org.
Ignore Eclipse files and folders.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/629edaa5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/629edaa5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/629edaa5
Branch: refs/heads/feature/LOG4J2-1430
Commit: 629edaa5a0843fff5a67f4d77581f29d028ed488
Parents: 9152a82
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 14:06:10 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 14:06:10 2016 -0700
----------------------------------------------------------------------
log4j-samples/scala-api/.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/629edaa5/log4j-samples/scala-api/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-samples/scala-api/.gitignore b/log4j-samples/scala-api/.gitignore
new file mode 100644
index 0000000..ddd6d6d
--- /dev/null
+++ b/log4j-samples/scala-api/.gitignore
@@ -0,0 +1,3 @@
+/.settings/
+/.classpath
+/.project
[09/50] logging-log4j2 git commit: Better method name in JUnit rule.
Posted by ma...@apache.org.
Better method name in JUnit rule.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9152a820
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9152a820
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9152a820
Branch: refs/heads/feature/LOG4J2-1430
Commit: 9152a8201a47b4ac2f16488d2f25a0ee895ac8e5
Parents: 94072a1
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 14:04:44 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 14:04:44 2016 -0700
----------------------------------------------------------------------
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 2 +-
.../rolling/RollingAppenderCronTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 2 +-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../log4j/core/config/ConfigurationTest.java | 2 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../core/config/MissingRootLoggerTest.java | 2 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 22 ++++++++++----------
16 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
index b754636..c3cc5b4 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java
@@ -32,6 +32,6 @@ public class DeadlockTest {
@Test
public void deadlockOnReconfigure() {
- context.getContext().reconfigure();
+ context.getLoggerContext().reconfigure();
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
index 574236c..572e392 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
@@ -69,7 +69,7 @@ public class LoggerUpdateTest {
@Test
public void testUpdateLoggersPropertyListeners() throws Exception {
- final LoggerContext ctx = context.getContext();
+ final LoggerContext ctx = context.getLoggerContext();
ctx.addPropertyChangeListener(new PropertyChangeListener() {
@Override
public void propertyChange(final PropertyChangeEvent evt) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
index 47cb060..aad7d27 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java
@@ -65,7 +65,7 @@ public class JsonCompleteFileAppenderTest {
final String logMsg = "Message flushed with immediate flush=true";
logger.info(logMsg);
logger.error(logMsg, new IllegalArgumentException("badarg"));
- this.loggerContextRule.getContext().stop(); // stops async thread
+ this.loggerContextRule.getLoggerContext().stop(); // stops async thread
String line1;
String line2;
String line3;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java
index 7f6f03d..3044c44 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppenderTests.java
@@ -77,7 +77,7 @@ public class RandomAccessFileAppenderTests {
final Logger logger = this.init.getLogger("com.foo.Bar");
final String message = "This is a test log message brought to you by Slurm.";
logger.info(message);
- this.init.getContext().stop(); // stop async thread
+ this.init.getLoggerContext().stop(); // stop async thread
String line;
try (final BufferedReader reader = new BufferedReader(new FileReader(this.logFile))) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
index b6ee09d..f995990 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
@@ -88,7 +88,7 @@ public class RollingAppenderCronOnceADayTest {
assertTrue("Log file does not exist", file.exists());
logger.debug("This is test message number 1, waiting for rolling");
- final RollingFileAppender app = (RollingFileAppender) loggerContextRule.getContext().getConfiguration().getAppender("RollingFile");
+ final RollingFileAppender app = (RollingFileAppender) loggerContextRule.getLoggerContext().getConfiguration().getAppender("RollingFile");
final TriggeringPolicy policy = app.getManager().getTriggeringPolicy();
assertNotNull("No triggering policy", policy);
assertTrue("Incorrect policy type", policy instanceof CronTriggeringPolicy);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
index d04de19..6c2ab9a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
@@ -94,7 +94,7 @@ public class RollingAppenderCronTest {
logger.debug("Adding new event {}", i);
}
Thread.sleep(1000);
- final RollingFileAppender app = (RollingFileAppender) loggerContextRule.getContext().getConfiguration().getAppender("RollingFile");
+ final RollingFileAppender app = (RollingFileAppender) loggerContextRule.getLoggerContext().getConfiguration().getAppender("RollingFile");
final TriggeringPolicy policy = app.getManager().getTriggeringPolicy();
assertNotNull("No triggering policy", policy);
assertTrue("Incorrect policy type", policy instanceof CronTriggeringPolicy);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
index 2fa5cd3..ac0c152 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/PropertiesRoutingAppenderTest.java
@@ -57,7 +57,7 @@ public class PropertiesRoutingAppenderTest {
@After
public void tearDown() throws Exception {
this.app.clear();
- this.loggerContextRule.getContext().stop();
+ this.loggerContextRule.getLoggerContext().stop();
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
index 3df13c6..cd28c21 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
@@ -56,7 +56,7 @@ public class RoutingAppenderTest {
@After
public void tearDown() throws Exception {
this.app.clear();
- this.loggerContextRule.getContext().stop();
+ this.loggerContextRule.getLoggerContext().stop();
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index db1f26b..8fdb402 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -71,7 +71,7 @@ public class RoutingAppenderWithPurgingTest {
@After
public void tearDown() throws Exception {
this.app.clear();
- this.loggerContextRule.getContext().stop();
+ this.loggerContextRule.getLoggerContext().stop();
}
@Test(timeout = 5000)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
index b003a84..caf2cde 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
@@ -56,7 +56,7 @@ public class RoutingDefaultAppenderTest {
if (app != null) {
app.clear();
}
- this.loggerContextRule.getContext().stop();
+ this.loggerContextRule.getLoggerContext().stop();
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
index 0c7c569..a9b48e7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
@@ -89,7 +89,7 @@ public class ConfigurationTest {
@Before
public void setUp() throws Exception {
- this.ctx = this.init.getContext();
+ this.ctx = this.init.getLoggerContext();
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
index 6c7b5f0..ab31fe0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
@@ -66,7 +66,7 @@ public class CustomConfigurationTest {
@Test
public void testConfig() {
// don't bother using "error" since that's the default; try another level
- final LoggerContext ctx = this.init.getContext();
+ final LoggerContext ctx = this.init.getLoggerContext();
ctx.reconfigure();
final Configuration config = ctx.getConfiguration();
assertThat(config, instanceOf(XmlConfiguration.class));
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java
index 60aa0d9..ba711dd 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java
@@ -42,7 +42,7 @@ public class MissingRootLoggerTest {
@Test
public void testMissingRootLogger() throws Exception {
- final LoggerContext ctx = context.getContext();
+ final LoggerContext ctx = context.getLoggerContext();
final Logger logger = ctx.getLogger("sample.Logger1");
assertTrue("Logger should have the INFO level enabled", logger.isInfoEnabled());
assertFalse("Logger should have the DEBUG level disabled", logger.isDebugEnabled());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java
index 9027b1d..8847da1 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/XIncludeTest.java
@@ -89,7 +89,7 @@ public class XIncludeTest {
@Before
public void setUp() throws Exception {
- this.ctx = this.init.getContext();
+ this.ctx = this.init.getLoggerContext();
}
@Test
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistryTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistryTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistryTest.java
index 505c272..433783e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistryTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/util/ShutdownCallbackRegistryTest.java
@@ -47,7 +47,7 @@ public class ShutdownCallbackRegistryTest {
@Test
public void testShutdownCallbackRegistry() throws Exception {
- final LoggerContext context = ctx.getContext();
+ final LoggerContext context = ctx.getLoggerContext();
assertTrue("LoggerContext should be started", context.isStarted());
assertThat(Registry.CALLBACKS, hasSize(1));
Registry.shutdown();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9152a820/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
index c3aaef9..b3ec1e0 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/LoggerContextRule.java
@@ -50,7 +50,7 @@ public class LoggerContextRule implements TestRule {
private static final String SYS_PROP_KEY_CLASS_NAME = "org.apache.logging.log4j.junit.LoggerContextRule#ClassName";
private static final String SYS_PROP_KEY_DISPLAY_NAME = "org.apache.logging.log4j.junit.LoggerContextRule#DisplayName";
private final String configLocation;
- private LoggerContext context;
+ private LoggerContext loggerContext;
private Class<? extends ContextSelector> contextSelectorClass;
private String testClassName;
private long shutdownTimeout;
@@ -107,16 +107,16 @@ public class LoggerContextRule implements TestRule {
// LogManager.setFactory(new Log4jContextFactory(LoaderUtil.newInstanceOf(contextSelectorClass)));
System.setProperty(SYS_PROP_KEY_CLASS_NAME, description.getClassName());
System.setProperty(SYS_PROP_KEY_DISPLAY_NAME, description.getDisplayName());
- context = Configurator.initialize(description.getDisplayName(),
+ loggerContext = Configurator.initialize(description.getDisplayName(),
description.getTestClass().getClassLoader(), configLocation);
try {
base.evaluate();
} finally {
- if (!Configurator.shutdown(context, shutdownTimeout, shutdownTimeUnit)) {
+ if (!Configurator.shutdown(loggerContext, shutdownTimeout, shutdownTimeUnit)) {
StatusLogger.getLogger().error("Logger context {} did not shutdown completely after {} {}.",
- context.getName(), shutdownTimeout, shutdownTimeUnit);
+ loggerContext.getName(), shutdownTimeout, shutdownTimeUnit);
}
- context = null;
+ loggerContext = null;
contextSelectorClass = null;
StatusLogger.getLogger().reset();
System.clearProperty(Constants.LOG4J_CONTEXT_SELECTOR);
@@ -160,7 +160,7 @@ public class LoggerContextRule implements TestRule {
* @return this LoggerContext's Configuration.
*/
public Configuration getConfiguration() {
- return context.getConfiguration();
+ return loggerContext.getConfiguration();
}
/**
@@ -168,8 +168,8 @@ public class LoggerContextRule implements TestRule {
*
* @return the current LoggerContext.
*/
- public LoggerContext getContext() {
- return context;
+ public LoggerContext getLoggerContext() {
+ return loggerContext;
}
/**
@@ -195,7 +195,7 @@ public class LoggerContextRule implements TestRule {
* @return the test class's named Logger.
*/
public Logger getLogger() {
- return context.getLogger(testClassName);
+ return loggerContext.getLogger(testClassName);
}
/**
@@ -206,7 +206,7 @@ public class LoggerContextRule implements TestRule {
* @return the named Logger.
*/
public Logger getLogger(final String name) {
- return context.getLogger(name);
+ return loggerContext.getLogger(name);
}
/**
@@ -249,7 +249,7 @@ public class LoggerContextRule implements TestRule {
* @return the root logger.
*/
public Logger getRootLogger() {
- return context.getRootLogger();
+ return loggerContext.getRootLogger();
}
@Override
[40/50] logging-log4j2 git commit: Keep adds together.
Posted by ma...@apache.org.
Keep adds together.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1dee3936
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1dee3936
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1dee3936
Branch: refs/heads/feature/LOG4J2-1430
Commit: 1dee3936c6e0fe6458be4b89502f21f177dbe27b
Parents: 090aca8
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 10:41:18 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 10:41:18 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1dee3936/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 58a7a08..fd1d09b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,9 +24,6 @@
</properties>
<body>
<release version="2.7" date="2016-MM-DD" description="GA Release 2.7">
- <action issue="LOG4J2-1528" dev="mikes" type="add">
- Create XML configuration file from ConfigurationBuilder.
- </action>
<action issue="LOG4J2-1511" dev="ggregory" type="fix" due-to="Srikanth Surukuntu">
DynamicThresholdFilter filters incorrectly when params are passed as individual arguments instead of varargs.
</action>
@@ -105,6 +102,9 @@
<action issue="LOG4J2-1502" dev="ggregory" type="fix" due-to="Sumit Singhal">
CsvParameterLayout and CsvLogEventLayout insert NUL characters if data starts with {, (, [ or "
</action>
+ <action issue="LOG4J2-1528" dev="mikes" type="add">
+ Create XML configuration file from ConfigurationBuilder.
+ </action>
<action issue="LOG4J2-1181" dev="mikes" type="add">
Scala API.
</action>
[24/50] logging-log4j2 git commit: [LOG4J2-1502] CsvParameterLayout
is inserting NUL character if data starts with {, (, [ or "
Posted by ma...@apache.org.
[LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or "
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f9a5d552
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f9a5d552
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f9a5d552
Branch: refs/heads/feature/LOG4J2-1430
Commit: f9a5d552a9040c50adcfdd46fc2aeff67281bd76
Parents: c85a63c
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 12:41:49 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 12:41:49 2016 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractCsvLayout.java | 10 ++--
.../CsvJsonParameterLayoutFileAppenderTest.java | 49 ++++++++++++++++----
src/changes/changes.xml | 3 ++
3 files changed, 50 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f9a5d552/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
index 3d0d80c..ffa6ea6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractCsvLayout.java
@@ -38,13 +38,13 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout {
protected static CSVFormat createFormat(final String format, final Character delimiter, final Character escape,
final Character quote, final QuoteMode quoteMode, final String nullString, final String recordSeparator) {
CSVFormat csvFormat = CSVFormat.valueOf(format);
- if (delimiter != null) {
+ if (isNotNul(delimiter)) {
csvFormat = csvFormat.withDelimiter(delimiter);
}
- if (escape != null) {
+ if (isNotNul(escape)) {
csvFormat = csvFormat.withEscape(escape);
}
- if (quote != null) {
+ if (isNotNul(quote)) {
csvFormat = csvFormat.withQuote(quote);
}
if (quoteMode != null) {
@@ -59,6 +59,10 @@ public abstract class AbstractCsvLayout extends AbstractStringLayout {
return csvFormat;
}
+ private static boolean isNotNul(final Character character) {
+ return character != null && character.charValue() != 0;
+ }
+
private final CSVFormat format;
protected AbstractCsvLayout(final Configuration config, final Charset charset, final CSVFormat csvFormat,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f9a5d552/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index 27c9366..e4357b5 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -26,13 +26,15 @@ import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import com.google.common.io.Files;
+/**
+ * Tests https://issues.apache.org/jira/browse/LOG4J2-1502
+ */
public class CsvJsonParameterLayoutFileAppenderTest {
private static final String FILE_PATH = "target/CsvJsonParameterLayoutFileAppenderTest.log";
@@ -42,7 +44,7 @@ public class CsvJsonParameterLayoutFileAppenderTest {
@Rule
public RuleChain rule = loggerContextRule.withCleanFilesRule(FILE_PATH);
- public void testNoNulCharacters(final String message) throws IOException {
+ public void testNoNulCharacters(final String message, final String expected) throws IOException {
@SuppressWarnings("resource")
final LoggerContext loggerContext = loggerContextRule.getLoggerContext();
final Logger logger = loggerContext.getLogger("com.example");
@@ -63,24 +65,53 @@ public class CsvJsonParameterLayoutFileAppenderTest {
Assert.assertEquals("File contains " + count0s + " 0x00 byte at indices " + sb, 0, count0s);
final List<String> readLines = Files.readLines(file, Charset.defaultCharset());
final String actual = readLines.get(0);
- Assert.assertTrue(actual, actual.contains(message));
+ // Assert.assertTrue(actual, actual.contains(message));
+ Assert.assertEquals(actual, expected, actual);
Assert.assertEquals(1, readLines.size());
}
@Test
- public void testNoNulCharactersABC() throws IOException {
- testNoNulCharacters("ABC");
+ public void testNoNulCharactersDoubleQuote() throws IOException {
+ // TODO This does not seem right but there is no NULs. Check Apache Commons CSV.
+ testNoNulCharacters("\"", "\"\"\"\"");
}
@Test
- @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
public void testNoNulCharactersJson() throws IOException {
- testNoNulCharacters("{\"id\":10,\"name\":\"Alice\"}");
+ testNoNulCharacters("{\"id\":10,\"name\":\"Alice\"}", "\"{\"\"id\"\":10,\"\"name\"\":\"\"Alice\"\"}\"");
+ }
+
+ @Test
+ public void testNoNulCharactersOneChar() throws IOException {
+ testNoNulCharacters("A", "A");
+ }
+
+ @Test
+ public void testNoNulCharactersOpenCurly() throws IOException {
+ // TODO Why is the char quoted? Check Apache Commons CSV.
+ testNoNulCharacters("{", "\"{\"");
+ }
+
+ @Test
+ public void testNoNulCharactersOpenParen() throws IOException {
+ // TODO Why is the char quoted? Check Apache Commons CSV.
+ testNoNulCharacters("(", "\"(\"");
+ }
+
+ @Test
+ public void testNoNulCharactersOpenSquare() throws IOException {
+ // TODO Why is the char quoted? Check Apache Commons CSV.
+ testNoNulCharacters("[", "\"[\"");
+ }
+
+ @Test
+ public void testNoNulCharactersThreeChars() throws IOException {
+ testNoNulCharacters("ABC", "ABC");
}
@Test
- @Ignore("https://issues.apache.org/jira/browse/LOG4J2-1502")
public void testNoNulCharactersXml() throws IOException {
- testNoNulCharacters("<test attr1='val1' attr2=\"value2\">X</test>");
+ testNoNulCharacters("<test attr1='val1' attr2=\"value2\">X</test>",
+ "\"<test attr1='val1' attr2=\"\"value2\"\">X</test>\"");
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f9a5d552/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b901033..10be4c8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -99,6 +99,9 @@
<action issue="LOG4J2-1235" dev="ggregory" type="fix" due-to="Niranjan Rao, Sascha Scholz, Aleksey Zvolinsky">
org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working correctly.
</action>
+ <action issue="LOG4J2-1502" dev="ggregory" type="fix" due-to="Sumit Singhal">
+ CsvParameterLayout is inserting NUL character if data starts with {, (, [ or "
+ </action>
<action issue="LOG4J2-1181" dev="mikes" type="add">
Scala API.
</action>
[45/50] logging-log4j2 git commit: Format nit.
Posted by ma...@apache.org.
Format nit.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ba49c96b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ba49c96b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ba49c96b
Branch: refs/heads/feature/LOG4J2-1430
Commit: ba49c96be58ea8e999e8904fe84c804889c1527a
Parents: d529c6c
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 15:03:32 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 15:03:32 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/SyslogAppender.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ba49c96b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index df60764..1e9cdc0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -125,7 +125,8 @@ public class SyslogAppender extends SocketAppender {
@PluginConfiguration final Configuration config,
@PluginAttribute(value = "charset", defaultString = "UTF-8") final Charset charsetName,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
- @PluginElement("LoggerFields") final LoggerFields[] loggerFields, @PluginAttribute(value = "advertise", defaultBoolean = false) final boolean advertise) {
+ @PluginElement("LoggerFields") final LoggerFields[] loggerFields,
+ @PluginAttribute(value = "advertise", defaultBoolean = false) final boolean advertise) {
// @formatter:on
// TODO: add Protocol to TypeConverters
[33/50] logging-log4j2 git commit: Proof-of-concept for Log4j 1.x
config conversion
Posted by ma...@apache.org.
Proof-of-concept for Log4j 1.x config conversion
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b0f568ef
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b0f568ef
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b0f568ef
Branch: refs/heads/feature/LOG4J2-1430
Commit: b0f568efa71feebf88202022f0e0ba0b6a749116
Parents: 1f99f1e
Author: Mikael St�ldal <mi...@magine.com>
Authored: Wed Aug 31 11:18:29 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Wed Aug 31 11:18:29 2016 +0200
----------------------------------------------------------------------
.../config/Log4j1ConfigurationConverter.java | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0f568ef/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
new file mode 100644
index 0000000..ed6a02f
--- /dev/null
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.log4j.config;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
+
+/**
+ * Tool for converting a Log4j 1.x properties configuration file to Log4j 2.x XML configuration file.
+ */
+public final class Log4j1ConfigurationConverter {
+
+ public static void main(String[] args) throws IOException {
+ try (InputStream input = args.length > 0 ? new FileInputStream(args[0]) : System.in;
+ OutputStream output = args.length > 1 ? new FileOutputStream(args[1]) : System.out) {
+ ConfigurationBuilder<BuiltConfiguration> builder = new Log4j1ConfigurationParser().buildConfigurationBuilder(input);
+ builder.writeXmlConfiguration(output);
+ }
+ }
+
+}
[37/50] logging-log4j2 git commit: Don't call same API over and over.
Posted by ma...@apache.org.
Don't call same API over and over.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6ac5219d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6ac5219d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6ac5219d
Branch: refs/heads/feature/LOG4J2-1430
Commit: 6ac5219d5d421fc6e1306bc9fd962b04af4acad7
Parents: 114e687
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 09:26:20 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 09:26:20 2016 -0700
----------------------------------------------------------------------
.../builder/ConfigurationBuilderTest.java | 56 ++++++++++----------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6ac5219d/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
index 4083f52..25772a7 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -30,6 +30,8 @@ import static org.junit.Assert.*;
public class ConfigurationBuilderTest {
+ private static final String EOL = System.lineSeparator();
+
private void addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {
builder.setConfigurationName(name);
builder.setStatusLevel(Level.ERROR);
@@ -52,33 +54,33 @@ public class ConfigurationBuilderTest {
}
private final static String expectedXml =
- "<?xml version='1.0' encoding='UTF-8'?>" + System.lineSeparator() +
- "<Configuration name=\"config name\" status=\"ERROR\" packages=\"foo,bar\">" + System.lineSeparator() +
- "\t<Properties>" + System.lineSeparator() +
- "\t\t<Property name=\"MyKey\">MyValue</Property>" + System.lineSeparator() +
- "\t</Properties>" + System.lineSeparator() +
- "\t<Scripts>" + System.lineSeparator() +
- "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + System.lineSeparator() +
- "\t</Scripts>" + System.lineSeparator() +
- "\t<CustomLevels>" + System.lineSeparator() +
- "\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + System.lineSeparator() +
- "\t</CustomLevels>" + System.lineSeparator() +
- "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + System.lineSeparator() +
- "\t<Appenders>" + System.lineSeparator() +
- "\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + System.lineSeparator() +
- "\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + System.lineSeparator() +
- "\t\t\t<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + System.lineSeparator() +
- "\t\t</CONSOLE>" + System.lineSeparator() +
- "\t</Appenders>" + System.lineSeparator() +
- "\t<Loggers>" + System.lineSeparator() +
- "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + System.lineSeparator() +
- "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() +
- "\t\t</Logger>" + System.lineSeparator() +
- "\t\t<Root level=\"ERROR\">" + System.lineSeparator() +
- "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() +
- "\t\t</Root>" + System.lineSeparator() +
- "\t</Loggers>" + System.lineSeparator() +
- "</Configuration>" + System.lineSeparator();
+ "<?xml version='1.0' encoding='UTF-8'?>" + EOL +
+ "<Configuration name=\"config name\" status=\"ERROR\" packages=\"foo,bar\">" + EOL +
+ "\t<Properties>" + EOL +
+ "\t\t<Property name=\"MyKey\">MyValue</Property>" + EOL +
+ "\t</Properties>" + EOL +
+ "\t<Scripts>" + EOL +
+ "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
+ "\t</Scripts>" + EOL +
+ "\t<CustomLevels>" + EOL +
+ "\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + EOL +
+ "\t</CustomLevels>" + EOL +
+ "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + EOL +
+ "\t<Appenders>" + EOL +
+ "\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + EOL +
+ "\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
+ "\t\t\t<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + EOL +
+ "\t\t</CONSOLE>" + EOL +
+ "\t</Appenders>" + EOL +
+ "\t<Loggers>" + EOL +
+ "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + EOL +
+ "\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
+ "\t\t</Logger>" + EOL +
+ "\t\t<Root level=\"ERROR\">" + EOL +
+ "\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
+ "\t\t</Root>" + EOL +
+ "\t</Loggers>" + EOL +
+ "</Configuration>" + EOL;
@Test
public void testXmlConstructing() throws Exception {
[16/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ". Add Assert.
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ". Add Assert.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/af7d1a0d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/af7d1a0d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/af7d1a0d
Branch: refs/heads/feature/LOG4J2-1430
Commit: af7d1a0d7ea4fcc45a61433352b13982ff53ca7e
Parents: a980632
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 17:43:27 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 17:43:27 2016 -0700
----------------------------------------------------------------------
.../log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/af7d1a0d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index 9526e99..27c9366 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -64,6 +64,7 @@ public class CsvJsonParameterLayoutFileAppenderTest {
final List<String> readLines = Files.readLines(file, Charset.defaultCharset());
final String actual = readLines.get(0);
Assert.assertTrue(actual, actual.contains(message));
+ Assert.assertEquals(1, readLines.size());
}
@Test
[06/50] logging-log4j2 git commit: Use try-with-resources.
Posted by ma...@apache.org.
Use try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3ca829c1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3ca829c1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3ca829c1
Branch: refs/heads/feature/LOG4J2-1430
Commit: 3ca829c194e68f23da6231e9545c35a923e507d1
Parents: 5812bb5
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:42:08 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:42:08 2016 -0700
----------------------------------------------------------------------
.../appender/NoSqlDatabaseManagerTest.java | 32 ++++++++------------
1 file changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3ca829c1/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
index 8d5b7a0..328ce31 100644
--- a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
+++ b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
@@ -73,29 +73,23 @@ public class NoSqlDatabaseManagerTest {
}
@Test
- public void testConnection() {
- replay(this.provider, this.connection);
+ public void testConnection() {
+ replay(this.provider, this.connection);
- final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0, this.provider);
+ try (final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0,
+ this.provider)) {
- assertNotNull("The manager should not be null.", manager);
+ assertNotNull("The manager should not be null.", manager);
- try {
- verify(this.provider, this.connection);
- reset(this.provider, this.connection);
- expect(this.provider.getConnection()).andReturn(this.connection);
- replay(this.provider, this.connection);
+ verify(this.provider, this.connection);
+ reset(this.provider, this.connection);
+ expect(this.provider.getConnection()).andReturn(this.connection);
+ replay(this.provider, this.connection);
- manager.connectAndStart();
- manager.commitAndClose();
- } finally {
- try {
- manager.close();
- } catch (final Throwable ignore) {
- /* */
- }
- }
- }
+ manager.connectAndStart();
+ manager.commitAndClose();
+ }
+ }
@Test
public void testWriteInternalNotConnected01() {
[32/50] logging-log4j2 git commit: Mention JIRA in README.md
Posted by ma...@apache.org.
Mention JIRA in README.md
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f99f1ec
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f99f1ec
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f99f1ec
Branch: refs/heads/feature/LOG4J2-1430
Commit: 1f99f1ec880366c6dde5b276a2773d4a8632244f
Parents: 2c0b7db
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Aug 30 19:10:20 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Aug 30 19:10:20 2016 +0200
----------------------------------------------------------------------
README.md | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f99f1ec/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8757d1b..d4286c1 100644
--- a/README.md
+++ b/README.md
@@ -21,3 +21,11 @@ Apache Log4j 2 is distributed under the [Apache License, version 2.0](http://www
[How to download Log4j](http://logging.apache.org/log4j/2.x/download.html),
and [how to use it from Maven, Ivy and Gradle](http://logging.apache.org/log4j/2.x/maven-artifacts.html).
+
+## Issue Tracking
+
+Issues, bugs, and feature requests should be submitted to the
+[JIRA issue tracking system for this project](https://issues.apache.org/jira/browse/LOG4J2).
+
+Pull request on GitHub are welcome, but please open a ticket in the JIRA issue tracker first, and mention the
+JIRA issue in the Pull Request.
[07/50] logging-log4j2 git commit: Use try-with-resources.
Posted by ma...@apache.org.
Use try-with-resources.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/370ea6c6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/370ea6c6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/370ea6c6
Branch: refs/heads/feature/LOG4J2-1430
Commit: 370ea6c68d3af73497debc3c2d5dc7f35eb0c91d
Parents: 3ca829c
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:42:55 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:42:55 2016 -0700
----------------------------------------------------------------------
.../appender/NoSqlDatabaseManagerTest.java | 40 +++++++++-----------
1 file changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/370ea6c6/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
----------------------------------------------------------------------
diff --git a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
index 328ce31..5209be2 100644
--- a/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
+++ b/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSqlDatabaseManagerTest.java
@@ -92,34 +92,28 @@ public class NoSqlDatabaseManagerTest {
}
@Test
- public void testWriteInternalNotConnected01() {
- replay(this.provider, this.connection);
+ public void testWriteInternalNotConnected01() {
+ replay(this.provider, this.connection);
- final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0, this.provider);
+ try (final NoSqlDatabaseManager<?> manager = NoSqlDatabaseManager.getNoSqlDatabaseManager("name", 0,
+ this.provider)) {
- try {
- verify(this.provider, this.connection);
- reset(this.provider, this.connection);
+ verify(this.provider, this.connection);
+ reset(this.provider, this.connection);
- final LogEvent event = createStrictMock(LogEvent.class);
- replay(this.provider, this.connection, event);
+ final LogEvent event = createStrictMock(LogEvent.class);
+ replay(this.provider, this.connection, event);
- try {
- manager.writeInternal(event);
- fail("Expected AppenderLoggingException.");
- } catch (final AppenderLoggingException ignore) {
- /* */
- }
+ try {
+ manager.writeInternal(event);
+ fail("Expected AppenderLoggingException.");
+ } catch (final AppenderLoggingException ignore) {
+ /* */
+ }
- verify(event);
- } finally {
- try {
- manager.close();
- } catch (final Throwable ignore) {
- /* */
- }
- }
- }
+ verify(event);
+ }
+ }
@Test
public void testWriteInternalNotConnected02() {
[26/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1553
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/master' into LOG4J2-1553
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e9b9ad9f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e9b9ad9f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e9b9ad9f
Branch: refs/heads/feature/LOG4J2-1430
Commit: e9b9ad9f1c1af8513b824100c046a78545527cd6
Parents: 7ad1489 b46c23c
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Aug 29 12:56:44 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 12:56:44 2016 -0700
----------------------------------------------------------------------
.../core/appender/routing/IdlePurgePolicy.java | 57 ++++++---
.../core/appender/routing/RoutingAppender.java | 35 +++---
.../log4j/core/layout/AbstractCsvLayout.java | 10 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 117 +++++++++++++++++++
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 2 +-
.../rolling/RollingAppenderCronTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 2 +-
.../appender/routing/RoutingAppenderTest.java | 2 +-
.../routing/RoutingAppenderWithPurgingTest.java | 21 +++-
.../routing/RoutingDefaultAppenderTest.java | 2 +-
.../log4j/core/config/ConfigurationTest.java | 2 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../core/config/MissingRootLoggerTest.java | 2 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../logging/log4j/junit/LoggerContextRule.java | 22 ++--
.../test/resources/log4j-cvs-json-parameter.xml | 32 +++++
log4j-samples/scala-api/.gitignore | 3 +
src/changes/changes.xml | 18 ++-
23 files changed, 273 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
[19/50] logging-log4j2 git commit: Added missing null check for
future in stop() because future could be null if there wasn't an log event
before
Posted by ma...@apache.org.
Added missing null check for future in stop() because future could be null if there wasn't an log event before
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d74f4b13
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d74f4b13
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d74f4b13
Branch: refs/heads/feature/LOG4J2-1430
Commit: d74f4b13cad1ba3c11945afd4f0410f5ea03d29d
Parents: 040e29e
Author: Aleksey Zvolinsky <al...@zvolinsky.name>
Authored: Wed Jun 22 08:46:48 2016 +0300
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 10:20:54 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/routing/IdlePurgePolicy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d74f4b13/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index dacf993..5a5ee6a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -60,7 +60,9 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
@Override
public void stop() {
super.stop();
- future.cancel(true);
+ if(future != null) {
+ future.cancel(true);
+ }
}
/**
[39/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/LOG4J2-1553'
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/LOG4J2-1553'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/090aca8f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/090aca8f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/090aca8f
Branch: refs/heads/feature/LOG4J2-1430
Commit: 090aca8fb841007c72d354d69efed339bb949cd0
Parents: 379b6ea 8bc6922
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 10:40:25 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 10:40:25 2016 -0700
----------------------------------------------------------------------
.../log4j/core/appender/AbstractManager.java | 41 ++-
.../appender/AbstractOutputStreamAppender.java | 2 +-
.../core/appender/AbstractWriterAppender.java | 2 +-
.../core/appender/MemoryMappedFileManager.java | 2 +-
.../core/appender/OutputStreamManager.java | 4 +-
.../core/appender/RandomAccessFileManager.java | 2 +-
.../log4j/core/appender/WriterManager.java | 4 +-
.../appender/db/AbstractDatabaseAppender.java | 4 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsAppender.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 362 +++++++++----------
.../core/appender/mom/kafka/KafkaAppender.java | 2 +-
.../appender/rolling/RollingFileManager.java | 2 +-
.../rolling/RollingRandomAccessFileManager.java | 2 +-
.../logging/log4j/core/lookup/JndiLookup.java | 2 +-
.../log4j/core/net/TcpSocketManager.java | 4 +-
.../log4j/core/net/server/JmsServer.java | 2 +-
.../core/selector/JndiContextSelector.java | 2 +-
.../appender/MemoryMappedFileManagerTest.java | 25 +-
.../db/AbstractDatabaseAppenderTest.java | 10 +-
.../db/jdbc/AbstractJdbcAppenderTest.java | 2 +-
.../db/jpa/AbstractJpaAppenderTest.java | 2 +-
.../log4j/core/appender/mom/JmsAppenderIT.java | 2 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 7 +-
.../log4j/flume/appender/FlumeAppender.java | 2 +-
.../appender/NoSqlDatabaseManagerTest.java | 81 ++---
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 4 +-
.../log4j/perf/jmh/JpaAppenderBenchmark.java | 4 +-
29 files changed, 291 insertions(+), 293 deletions(-)
----------------------------------------------------------------------
[12/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ".
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/447ca8d9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/447ca8d9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/447ca8d9
Branch: refs/heads/feature/LOG4J2-1430
Commit: 447ca8d9b54499b214b38b75e2911b9e76b6e87c
Parents: debb8ec
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 14:32:37 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 14:32:37 2016 -0700
----------------------------------------------------------------------
log4j-core/src/test/resources/log4j-cvs-json-parameter.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/447ca8d9/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml b/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
index f47f69e..ad73a80 100644
--- a/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
+++ b/log4j-core/src/test/resources/log4j-cvs-json-parameter.xml
@@ -14,7 +14,6 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-->
<Configuration status="warn" name="CsvJsonParameterLayoutFileAppenderTest">
<Appenders>
@@ -25,7 +24,6 @@
</Appenders>
<Loggers>
-
<Root level="error">
<AppenderRef ref="File"/>
</Root>
[44/50] logging-log4j2 git commit: Ignore Eclipse IDE files.
Posted by ma...@apache.org.
Ignore Eclipse IDE files.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d529c6c5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d529c6c5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d529c6c5
Branch: refs/heads/feature/LOG4J2-1430
Commit: d529c6c51ef13e26a03ed97973ceab68ed5961fc
Parents: 4dfcb20
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 14:40:41 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 14:40:41 2016 -0700
----------------------------------------------------------------------
log4j-api-scala_2.11/.gitignore | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d529c6c5/log4j-api-scala_2.11/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/.gitignore b/log4j-api-scala_2.11/.gitignore
index ddd6d6d..240ba48 100644
--- a/log4j-api-scala_2.11/.gitignore
+++ b/log4j-api-scala_2.11/.gitignore
@@ -1,3 +1,5 @@
/.settings/
/.classpath
/.project
+/.cache-main
+/.cache-tests
[05/50] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1553
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/master' into LOG4J2-1553
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5812bb56
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5812bb56
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5812bb56
Branch: refs/heads/feature/LOG4J2-1430
Commit: 5812bb56f0fb1994bffbb1e9fc27e859d1f7cd0d
Parents: 13c3c24 94072a1
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 13:36:30 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 13:36:30 2016 -0700
----------------------------------------------------------------------
.../db/jdbc/AbstractJdbcAppenderTest.java | 12 +--------
.../db/jpa/AbstractJpaAppenderTest.java | 12 +--------
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +++++++++-----------
.../db/jpa/JpaHyperSqlAppenderTest.java | 28 +++++++++-----------
4 files changed, 28 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5812bb56/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5812bb56/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
----------------------------------------------------------------------
[47/50] logging-log4j2 git commit: Simplify Git ignore files.
Posted by ma...@apache.org.
Simplify Git ignore files.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fa1fd11f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fa1fd11f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fa1fd11f
Branch: refs/heads/feature/LOG4J2-1430
Commit: fa1fd11f8e27ff6847b6b87f41c5d26738148490
Parents: a189687
Author: ggregory <gg...@apache.org>
Authored: Thu Sep 1 08:09:24 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Sep 1 08:09:24 2016 -0700
----------------------------------------------------------------------
.gitignore | 11 +++++++----
log4j-api-scala_2.11/.gitignore | 5 -----
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fa1fd11f/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 969c94f..9ba0860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
-/.project
-/.idea
+.project
+.idea
**/*.iml
**/target
-/target/
-/.settings
+target/
+.settings
+.classpath
+.cache-main
+.cache-tests
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fa1fd11f/log4j-api-scala_2.11/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-api-scala_2.11/.gitignore b/log4j-api-scala_2.11/.gitignore
deleted file mode 100644
index 240ba48..0000000
--- a/log4j-api-scala_2.11/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.settings/
-/.classpath
-/.project
-/.cache-main
-/.cache-tests
[13/50] logging-log4j2 git commit: Test [LOG4J2-1502]
CsvParameterLayout is inserting NUL character if data starts with {, (,
[ or ". Better assert message.
Posted by ma...@apache.org.
Test [LOG4J2-1502] CsvParameterLayout is inserting NUL character if data
starts with {, (, [ or ". Better assert message.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8d873b06
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8d873b06
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8d873b06
Branch: refs/heads/feature/LOG4J2-1430
Commit: 8d873b06128cb5dea61e25a61c36a9ebf63caadf
Parents: 447ca8d
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Aug 28 14:40:53 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Aug 28 14:40:53 2016 -0700
----------------------------------------------------------------------
.../core/appender/CsvJsonParameterLayoutFileAppenderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d873b06/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
index 851e692..4722c3a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
@@ -63,7 +63,7 @@ public class CsvJsonParameterLayoutFileAppenderTest {
count0s++;
}
}
- Assert.assertEquals("File contains at least one 0x00 byte at indices " + sb, 0, count0s);
+ Assert.assertEquals("File contains " + count0s + " 0x00 byte at indices " + sb, 0, count0s);
final List<String> readLines = Files.readLines(file, Charset.defaultCharset());
final String actual = readLines.get(0);
Assert.assertTrue(actual, actual.contains(json));
[20/50] logging-log4j2 git commit: Code style fixes
Posted by ma...@apache.org.
Code style fixes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/183fbf23
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/183fbf23
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/183fbf23
Branch: refs/heads/feature/LOG4J2-1430
Commit: 183fbf23944256f7ba3a38315077f0368e76c460
Parents: f8b86f5
Author: Aleksey Zvolinsky <al...@zvolinsky.name>
Authored: Thu Aug 4 12:15:07 2016 +0300
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 10:20:55 2016 -0700
----------------------------------------------------------------------
.../core/appender/routing/IdlePurgePolicy.java | 10 +++++-----
.../core/appender/routing/RoutingAppender.java | 20 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/183fbf23/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index 9fee717..e2b818e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -63,7 +63,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
@Override
public void stop() {
super.stop();
- if(future != null) {
+ if (future != null) {
future.cancel(true);
}
}
@@ -77,7 +77,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
for (final Entry<String, Long> entry : appendersUsage.entrySet()) {
if (entry.getValue() < createTime) {
LOGGER.debug("Removing appender " + entry.getKey());
- if(appendersUsage.remove(entry.getKey(), entry.getValue())) {
+ if (appendersUsage.remove(entry.getKey(), entry.getValue())) {
routingAppender.deleteAppender(entry.getKey());
}
}
@@ -153,17 +153,17 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
}
long ttl = units.toMillis(Long.parseLong(timeToLive));
- if(ttl < 0) {
+ if (ttl < 0) {
LOGGER.error("timeToLive must be positive. timeToLive set to 0");
ttl = 0;
}
long ci;
- if(checkInterval == null) {
+ if (checkInterval == null) {
ci = ttl;
} else {
ci = units.toMillis(Long.parseLong(checkInterval));
- if(ci < 0) {
+ if (ci < 0) {
LOGGER.error("checkInterval must be positive. checkInterval set equal to timeToLive = {}", ttl);
ci = ttl;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/183fbf23/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
index 059413d..7e11254 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
@@ -52,7 +52,7 @@ public final class RoutingAppender extends AbstractAppender {
private final Configuration config;
private final ConcurrentMap<String, AppenderControl> appenders = new ConcurrentHashMap<>();
private final RewritePolicy rewritePolicy;
- private final PurgePolicy purgePolicy;
+ private final PurgePolicy purgePolicy;
private RoutingAppender(final String name, final Filter filter, final boolean ignoreExceptions, final Routes routes,
final RewritePolicy rewritePolicy, final Configuration config, final PurgePolicy purgePolicy) {
@@ -61,8 +61,8 @@ public final class RoutingAppender extends AbstractAppender {
this.config = config;
this.rewritePolicy = rewritePolicy;
this.purgePolicy = purgePolicy;
- if(this.purgePolicy != null) {
- this.purgePolicy.initialize(this);
+ if (this.purgePolicy != null) {
+ this.purgePolicy.initialize(this);
}
Route defRoute = null;
for (final Route route : routes.getRoutes()) {
@@ -117,12 +117,12 @@ public final class RoutingAppender extends AbstractAppender {
control.callAppender(event);
}
- if(purgePolicy != null) {
- purgePolicy.update(key, event);
+ if (purgePolicy != null) {
+ purgePolicy.update(key, event);
}
}
- private synchronized AppenderControl getControl(final String key, final LogEvent event) {
+ private synchronized AppenderControl getControl(final String key, final LogEvent event) {
AppenderControl control = appenders.get(key);
if (control != null) {
return control;
@@ -173,8 +173,8 @@ public final class RoutingAppender extends AbstractAppender {
}
public Map<String, AppenderControl> getAppenders() {
- return Collections.unmodifiableMap(appenders);
- }
+ return Collections.unmodifiableMap(appenders);
+ }
/**
* Delete specified appender
@@ -186,8 +186,8 @@ public final class RoutingAppender extends AbstractAppender {
AppenderControl control = appenders.remove(key);
control.getAppender().stop();
LOGGER.debug("Deleting route with " + key + " key ");
- AppenderControl control = appenders.remove(key);
- if(null != control) {
+ final AppenderControl control = appenders.remove(key);
+ if (null != control) {
LOGGER.debug("Stopping route with " + key + " key");
control.getAppender().stop();
} else {
[30/50] logging-log4j2 git commit: Fix changes.xml
Posted by ma...@apache.org.
Fix changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/eb82f77c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/eb82f77c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/eb82f77c
Branch: refs/heads/feature/LOG4J2-1430
Commit: eb82f77c01d438c330c6997c99ca9ffb9228d4f5
Parents: 45a7da2
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Aug 30 11:31:02 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Aug 30 11:31:02 2016 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/eb82f77c/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0842ec5..58a7a08 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -27,12 +27,6 @@
<action issue="LOG4J2-1528" dev="mikes" type="add">
Create XML configuration file from ConfigurationBuilder.
</action>
- <action issue="LOG4J2-1181" dev="mikes" type="add">
- Scala API.
- </action>
- <action issue="LOG4J2-1512" dev="mikes" type="add">
- Options to exclude stack trace from JSON, XML and YAML layouts.
- </action>
<action issue="LOG4J2-1511" dev="ggregory" type="fix" due-to="Srikanth Surukuntu">
DynamicThresholdFilter filters incorrectly when params are passed as individual arguments instead of varargs.
</action>
@@ -105,6 +99,18 @@
<action issue="LOG4J2-1313" dev="rpopma" type="fix" due-to="Philipp Knobel">
Properties declared in configuration can now have their value either in the element body or in an attribute named "value".
</action>
+ <action issue="LOG4J2-1235" dev="ggregory" type="fix" due-to="Niranjan Rao, Sascha Scholz, Aleksey Zvolinsky">
+ org.apache.logging.log4j.core.appender.routing.IdlePurgePolicy not working correctly.
+ </action>
+ <action issue="LOG4J2-1502" dev="ggregory" type="fix" due-to="Sumit Singhal">
+ CsvParameterLayout and CsvLogEventLayout insert NUL characters if data starts with {, (, [ or "
+ </action>
+ <action issue="LOG4J2-1181" dev="mikes" type="add">
+ Scala API.
+ </action>
+ <action issue="LOG4J2-1512" dev="mikes" type="add">
+ Options to exclude stack trace from JSON, XML and YAML layouts.
+ </action>
<action issue="LOG4J2-1539" dev="ggregory" type="add" due-to="Gary Gregory">
Add Core API Configurator.shutdown(LoggerContext, long, TimeUnit).
</action>
[18/50] logging-log4j2 git commit: Fixed compilation error after
merge with master
Posted by ma...@apache.org.
Fixed compilation error after merge with master
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f8b86f51
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f8b86f51
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f8b86f51
Branch: refs/heads/feature/LOG4J2-1430
Commit: f8b86f5191ed7756f83fe8f3115d2eb5c2365ae7
Parents: d74f4b1
Author: Aleksey Zvolinsky <al...@zvolinsky.name>
Authored: Mon Aug 1 00:47:35 2016 +0300
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Aug 29 10:20:54 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/routing/IdlePurgePolicy.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8b86f51/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
index 5a5ee6a..9fee717 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
@@ -31,6 +32,7 @@ import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.status.StatusLogger;
/**
* Policy is purging appenders that were not in use specified time in minutes
@@ -39,6 +41,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@Scheduled
public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, Runnable {
+ private static final Logger LOGGER = StatusLogger.getLogger();
private final long timeToLive;
private final long checkInterval;
private final ConcurrentMap<String, Long> appendersUsage = new ConcurrentHashMap<>();
@@ -46,7 +49,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R
private final ConfigurationScheduler scheduler;
private volatile ScheduledFuture<?> future = null;
- public IdlePurgePolicy(long timeToLive, long checkInterval, final ConfigurationScheduler scheduler) {
+ public IdlePurgePolicy(final long timeToLive, final long checkInterval, final ConfigurationScheduler scheduler) {
this.timeToLive = timeToLive;
this.checkInterval = checkInterval;
this.scheduler = scheduler;