You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/08/06 00:52:43 UTC
[1/2] logging-log4j2 git commit: Delete RAF log file, clarified names.
Repository: logging-log4j2
Updated Branches:
refs/heads/master aa5151e19 -> 27cacebe9
Delete RAF log file, clarified names.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b5ee90a8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b5ee90a8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b5ee90a8
Branch: refs/heads/master
Commit: b5ee90a886970cfa8ec372bec60cb001d1b10ade
Parents: 7f075a7
Author: rpopma <rp...@apache.org>
Authored: Thu Aug 6 07:51:45 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Aug 6 07:51:45 2015 +0900
----------------------------------------------------------------------
.../log4j/perf/jmh/FileAppenderBenchmark.java | 40 ++++++++++----------
1 file changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b5ee90a8/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
index 810a7e9..9bea11e 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderBenchmark.java
@@ -40,10 +40,10 @@ import java.util.concurrent.TimeUnit;
// java -jar target/benchmarks.jar ".*FileAppenderBenchmark.*" -f 1 -i 5 -wi 5 -bm sample -tu ns
@State(Scope.Thread)
public class FileAppenderBenchmark {
- Logger log4jLogger;
- Logger log4jRandomLogger;
+ Logger log4j2Logger;
+ Logger log4j2RandomLogger;
org.slf4j.Logger slf4jLogger;
- org.apache.log4j.Logger log4jClassicLogger;
+ org.apache.log4j.Logger log4j1Logger;
int j;
@Setup
@@ -58,11 +58,13 @@ public class FileAppenderBenchmark {
log4jFile.delete();
File log4j2File = new File ("target/testlog4j2.log");
log4j2File.delete();
+ File log4j2RAF = new File ("target/testRandomlog4j2.log");
+ log4j2RAF.delete();
- log4jLogger = LogManager.getLogger(FileAppenderBenchmark.class);
- log4jRandomLogger = LogManager.getLogger("TestRandom");
+ log4j2Logger = LogManager.getLogger(FileAppenderBenchmark.class);
+ log4j2RandomLogger = LogManager.getLogger("TestRandom");
slf4jLogger = LoggerFactory.getLogger(FileAppenderBenchmark.class);
- log4jClassicLogger = org.apache.log4j.Logger.getLogger(FileAppenderBenchmark.class);
+ log4j1Logger = org.apache.log4j.Logger.getLogger(FileAppenderBenchmark.class);
j = 0;
}
@@ -76,7 +78,7 @@ public class FileAppenderBenchmark {
logbackFile.delete();
File log4jFile = new File ("target/testlog4j.log");
log4jFile.delete();
- File log4jRandomFile = new File ("target/testRandomlog4j.log");
+ File log4jRandomFile = new File ("target/testRandomlog4j2.log");
log4jRandomFile.delete();
File log4j2File = new File ("target/testlog4j2.log");
log4j2File.delete();
@@ -93,50 +95,50 @@ public class FileAppenderBenchmark {
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void log4jRandomDebugStringConcatenation() {
- log4jRandomLogger.debug("This is a debug [" + ++j + "] message");
+ public void log4j2RAFStringConcatenation() {
+ log4j2RandomLogger.debug("This is a debug [" + ++j + "] message");
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void log4jDebugStringConcatenation() {
- log4jLogger.debug("This is a debug [" + ++j + "] message");
+ public void log4j2StringConcatenation() {
+ log4j2Logger.debug("This is a debug [" + ++j + "] message");
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void slf4jDebugStringConcatenation() {
+ public void slf4jStringConcatenation() {
slf4jLogger.debug("This is a debug [" + ++j + "] message");
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void log4jClassicDebugStringConcatenation() {
- log4jClassicLogger.debug("This is a debug [" + ++j + "] message");
+ public void log4j1StringConcatenation() {
+ log4j1Logger.debug("This is a debug [" + ++j + "] message");
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void log4jDebugRandomParameterizedString() {
- log4jRandomLogger.debug("This is a debug [{}] message", ++j);
+ public void log4j2RAFParameterizedString() {
+ log4j2RandomLogger.debug("This is a debug [{}] message", ++j);
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void log4jDebugParameterizedString() {
- log4jLogger.debug("This is a debug [{}] message", ++j);
+ public void log4j2ParameterizedString() {
+ log4j2Logger.debug("This is a debug [{}] message", ++j);
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
@Benchmark
- public void slf4jDebugParameterizedString() {
+ public void slf4jParameterizedString() {
slf4jLogger.debug("This is a debug [{}] message", ++j);
}
}
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by rp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/27cacebe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27cacebe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27cacebe
Branch: refs/heads/master
Commit: 27cacebe9f793dec167c51a72e724b50bec5c474
Parents: b5ee90a aa5151e
Author: rpopma <rp...@apache.org>
Authored: Thu Aug 6 07:52:16 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Aug 6 07:52:16 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/LogManager.java | 1100 +++++++++---------
.../rolling/DefaultRolloverStrategy.java | 4 +-
.../logging/log4j/core/config/LoggerConfig.java | 8 +-
log4j-samples/loggerProperties/pom.xml | 55 +
.../logging/log4j/lookup/CustomLookup.java | 84 ++
.../logging/log4j/lookup/CustomMapMessage.java | 51 +
.../logging/log4j/lookup/MapMessageLookup.java | 90 ++
.../logging/log4j/CustomPropertiesTest.java | 51 +
.../src/test/resources/log4j2.xml | 48 +
log4j-samples/pom.xml | 1 +
pom.xml | 2 +-
src/changes/changes.xml | 8 +-
12 files changed, 947 insertions(+), 555 deletions(-)
----------------------------------------------------------------------