You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/08/18 17:50:24 UTC
[06/14] storm git commit: STORM-976.
STORM-976.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/98f6cd26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/98f6cd26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/98f6cd26
Branch: refs/heads/master
Commit: 98f6cd26c5e63af03c411952b2c790564a2e7149
Parents: 962d57b
Author: YvonneIronberg <Yv...@gmail.com>
Authored: Fri Aug 14 16:08:57 2015 -0700
Committer: YvonneIronberg <Yv...@gmail.com>
Committed: Fri Aug 14 16:08:57 2015 -0700
----------------------------------------------------------------------
.../flux-core/src/test/resources/log4j2.xml | 34 ++++++++++++++++++++
.../flux-core/src/test/resources/logback.xml | 30 -----------------
2 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/98f6cd26/external/flux/flux-core/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/resources/log4j2.xml b/external/flux/flux-core/src/test/resources/log4j2.xml
new file mode 100644
index 0000000..fb342db
--- /dev/null
+++ b/external/flux/flux-core/src/test/resources/log4j2.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 scan="true" monitorInterval="30">
+ <Appenders>
+ <Console name="A1" target="SYSTEM_OUT">
+ <PatternLayout>
+ <pattern>%-4r [%t] %-5level %c{1} - %msg%n</pattern>
+ </PatternLayout>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.storm.curator" level="warn"/>
+ <Logger name="org.apache.storm.flux" level="debug"/>
+ <Logger name="org.apache.storm.zookeeper" level="warn"/>
+ <Root level="debug">
+ <appender-ref ref="A1"/>
+ </Root>
+ </Loggers>
+</Configuration>
http://git-wip-us.apache.org/repos/asf/storm/blob/98f6cd26/external/flux/flux-core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/test/resources/logback.xml b/external/flux/flux-core/src/test/resources/logback.xml
deleted file mode 100644
index 1853b8a..0000000
--- a/external/flux/flux-core/src/test/resources/logback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.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.
--->
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
- <logger name="org.apache.storm.zookeeper" level="WARN"/>
- <logger name="org.apache.storm.curator" level="WARN"/>
- <logger name="org.apache.storm.flux" level="DEBUG"/>
- <root level="DEBUG">
- <appender-ref ref="A1"/>
- </root>
-</configuration>