Repository: storm Updated Branches: refs/heads/0.10.x-branch 446c88267 -> 750c8a415
Merge branch 'STORM-850' of https://github.com/HeartSaVioR/storm into STORM-850 STORM-850: Convert storm-core's logback-test.xml to log4j2-test.xml Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3038ce8f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3038ce8f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3038ce8f Branch: refs/heads/0.10.x-branch Commit: 3038ce8f6595a0ac89eb7e6520abb990664a9c9e Parents: 446c882 Author: Robert (Bobby) Evans <[email protected]> Authored: Fri Jun 5 12:13:29 2015 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Fri Jun 5 12:26:03 2015 -0500 ---------------------------------------------------------------------- storm-core/test/resources/log4j2-test.xml | 32 +++++++++++++++++++++++++ storm-core/test/resources/logback-test.xml | 26 -------------------- 2 files changed, 32 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/3038ce8f/storm-core/test/resources/log4j2-test.xml ---------------------------------------------------------------------- diff --git a/storm-core/test/resources/log4j2-test.xml b/storm-core/test/resources/log4j2-test.xml new file mode 100644 index 0000000..4b12147 --- /dev/null +++ b/storm-core/test/resources/log4j2-test.xml @@ -0,0 +1,32 @@ +<?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 monitorInterval="60"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%-4r [%t] %-5p %c{1.} - %msg%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.zookeeper" level="WARN"/> + <Root level="${env:LOG_LEVEL:-INFO}"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</configuration> + http://git-wip-us.apache.org/repos/asf/storm/blob/3038ce8f/storm-core/test/resources/logback-test.xml ---------------------------------------------------------------------- diff --git a/storm-core/test/resources/logback-test.xml b/storm-core/test/resources/logback-test.xml deleted file mode 100644 index 346b8ca..0000000 --- a/storm-core/test/resources/logback-test.xml +++ /dev/null @@ -1,26 +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.zookeeper" level="WARN"/> - <root level="${LOG_LEVEL:-INFO}"> - <appender-ref ref="A1"/> - </root> -</configuration> \ No newline at end of file
