You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/23 17:38:10 UTC
[1/3] logging-log4j2 git commit: LOG4J2-1100 Unable to configure
Multiple triggering policies on rolling file appender using yaml
configuration file.
Repository: logging-log4j2
Updated Branches:
refs/heads/master f92b4c88b -> 856106af0
LOG4J2-1100
Unable to configure Multiple triggering policies on rolling file
appender using yaml configuration file.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1d96dafa
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1d96dafa
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1d96dafa
Branch: refs/heads/master
Commit: 1d96dafa4719ad501d2c77e25e0950055d86f92b
Parents: 7ec8a13
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 23 08:36:37 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 23 08:36:37 2015 -0700
----------------------------------------------------------------------
.../config/JiraLog4j2_1100YamlGoodTest.java | 26 +++++++++++++++++
.../core/config/JiraLog4j2_1100YamlTest.java | 29 -------------------
.../test/resources/LOG4J2-1100/log4j2-bad.yaml | 30 ++++++++++++++++++++
.../src/test/resources/LOG4J2-1100/log4j2.yaml | 30 --------------------
4 files changed, 56 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d96dafa/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java
new file mode 100644
index 0000000..da1be0d
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlGoodTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.config;
+
+public class JiraLog4j2_1100YamlGoodTest extends AbstractLog4j2_1100Test {
+
+ protected String getConfigurationResource() {
+ return "LOG4J2-1100/log4j2-good.yaml";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d96dafa/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlTest.java
deleted file mode 100644
index f58e25f..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.config;
-
-import org.junit.Ignore;
-
-@Ignore
-public class JiraLog4j2_1100YamlTest extends AbstractLog4j2_1100Test {
-
- protected String getConfigurationResource() {
- return "LOG4J2-1100/log4j2.yaml";
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d96dafa/log4j-core/src/test/resources/LOG4J2-1100/log4j2-bad.yaml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/LOG4J2-1100/log4j2-bad.yaml b/log4j-core/src/test/resources/LOG4J2-1100/log4j2-bad.yaml
new file mode 100644
index 0000000..7bec043
--- /dev/null
+++ b/log4j-core/src/test/resources/LOG4J2-1100/log4j2-bad.yaml
@@ -0,0 +1,30 @@
+Configuration:
+ status: trace
+
+ Appenders:
+ Console:
+ - name: Console
+ target: SYSTEM_OUT
+ PatternLayout:
+ Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+ RollingFile:
+ - name: File
+ fileName: "${sys:user.home}/.btat/btat.log"
+ filePattern: "${sys:user.home}/.btat/logs/btat-%d{yyyy-MM}-%i.log.gz"
+ PatternLayout:
+ Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
+ Policies:
+ - TimeBasedTriggeringPolicy:
+ interval: 7
+ - SizeBasedTriggeringPolicy:
+ size: 100 MB
+ DefaultRolloverStrategy:
+ max: 20
+
+ Loggers:
+ Root:
+ level: info
+ AppenderRef:
+ - ref: Console
+ - ref: File
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d96dafa/log4j-core/src/test/resources/LOG4J2-1100/log4j2.yaml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/LOG4J2-1100/log4j2.yaml b/log4j-core/src/test/resources/LOG4J2-1100/log4j2.yaml
deleted file mode 100644
index 7bec043..0000000
--- a/log4j-core/src/test/resources/LOG4J2-1100/log4j2.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-Configuration:
- status: trace
-
- Appenders:
- Console:
- - name: Console
- target: SYSTEM_OUT
- PatternLayout:
- Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
- RollingFile:
- - name: File
- fileName: "${sys:user.home}/.btat/btat.log"
- filePattern: "${sys:user.home}/.btat/logs/btat-%d{yyyy-MM}-%i.log.gz"
- PatternLayout:
- Pattern: "%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"
- Policies:
- - TimeBasedTriggeringPolicy:
- interval: 7
- - SizeBasedTriggeringPolicy:
- size: 100 MB
- DefaultRolloverStrategy:
- max: 20
-
- Loggers:
- Root:
- level: info
- AppenderRef:
- - ref: Console
- - ref: File
-
\ No newline at end of file
[3/3] logging-log4j2 git commit: LOG4J2-1100 Unable to configure
Multiple triggering policies on rolling file appender using yaml
configuration file.
Posted by gg...@apache.org.
LOG4J2-1100
Unable to configure Multiple triggering policies on rolling file
appender using yaml configuration file.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/856106af
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/856106af
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/856106af
Branch: refs/heads/master
Commit: 856106af0f485fe6593ee4efff73c86b1e66ba53
Parents: 5ef1fe3
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 23 08:37:40 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 23 08:37:40 2015 -0700
----------------------------------------------------------------------
.../core/config/JiraLog4j2_1100YamlBadTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/856106af/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java
new file mode 100644
index 0000000..8a1be96
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/JiraLog4j2_1100YamlBadTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.config;
+
+import org.junit.Ignore;
+
+@Ignore
+public class JiraLog4j2_1100YamlBadTest extends AbstractLog4j2_1100Test {
+
+ protected String getConfigurationResource() {
+ return "LOG4J2-1100/log4j2-good.yaml";
+ }
+
+}
[2/3] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@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/5ef1fe32
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5ef1fe32
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5ef1fe32
Branch: refs/heads/master
Commit: 5ef1fe32e6196f7456874c5120f1e6bfd2137082
Parents: 1d96daf f92b4c8
Author: ggregory <gg...@apache.org>
Authored: Sun Aug 23 08:36:57 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun Aug 23 08:36:57 2015 -0700
----------------------------------------------------------------------
.../jmh/PatternLayoutComparisonBenchmark.java | 127 +++++++++++++++++++
1 file changed, 127 insertions(+)
----------------------------------------------------------------------