You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/04/10 10:30:46 UTC
[6/8] logging-log4j2 git commit: Merge fix 2
Merge fix 2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7c990c4a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c990c4a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c990c4a
Branch: refs/heads/master
Commit: 7c990c4a0b8dd0ffcb4adfe7e19cb9ac39288bbf
Parents: 4009bcb
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri Apr 8 14:10:39 2016 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri Apr 8 14:10:39 2016 +0200
----------------------------------------------------------------------
log4j-core/src/test/resources/gcFreeLogging.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c990c4a/log4j-core/src/test/resources/gcFreeLogging.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/gcFreeLogging.xml b/log4j-core/src/test/resources/gcFreeLogging.xml
index caf1dd7..f90d754 100644
--- a/log4j-core/src/test/resources/gcFreeLogging.xml
+++ b/log4j-core/src/test/resources/gcFreeLogging.xml
@@ -10,7 +10,7 @@
</PatternLayout>
</File>
<RollingFile name="RollingFile" fileName="target/gcfreeRollingFile.log"
- filePattern="target/gcfree-%d{MM-dd-yy-HH-mm-ss}.log.gz">
+ filePattern="target/gcfree-%d{MM-dd-yy-HH-mm-ss}.log.gz">
<PatternLayout>
<Pattern>%d %p %c{1.} [%t] %m%n</Pattern>
</PatternLayout>
@@ -24,9 +24,9 @@
</PatternLayout>
</RandomAccessFile>
<RollingRandomAccessFile name="RollingRandomAccessFile"
- fileName="target/gcfreeRRAF.log"
- filePattern="target/afterRollover-%i.log" append="false"
- immediateFlush="false">
+ fileName="target/gcfreeRRAF.log"
+ filePattern="target/afterRollover-%i.log" append="false"
+ immediateFlush="false">
<PatternLayout>
<Pattern>%d %p %c{1.} [%t] %X{aKey} %m %location %ex%n</Pattern>
</PatternLayout>
@@ -35,13 +35,13 @@
</Policies>
</RollingRandomAccessFile>
<MemoryMappedFile name="MemoryMappedFile"
- fileName="target/gcfreemmap.log"
- immediateFlush="false" append="false">
+ fileName="target/gcfreemmap.log"
+ immediateFlush="false" append="false">
<PatternLayout>
<Pattern>%d %p %c{1.} [%t] %X{aKey} %m%ex%n</Pattern>
</PatternLayout>
</MemoryMappedFile>
- <RandomAccessFile name="RandomAccessFileGelf" fileName="gcfree.json" immediateFlush="false" append="false">
+ <RandomAccessFile name="RandomAccessFileGelf" fileName="target/gcfree.json" immediateFlush="false" append="false">
<GelfLayout compressionType="OFF"/>
</RandomAccessFile>
</Appenders>