This is an automated email from the ASF dual-hosted git repository. liubao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit f7cd7c2b64609048b5cc787823580c19713ed19e Author: liubao <[email protected]> AuthorDate: Wed Jul 25 10:37:31 2018 +0800 [SCB-772]revert tracing module change. Because this module have it's custom logic for Appender. --- .../servicecomb/tests/tracing/TracingTestMain.java | 4 +--- .../src/test/resources/config/log4j.z.properties | 21 --------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/integration-tests/tracing-tests/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestMain.java b/integration-tests/tracing-tests/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestMain.java index 9969c2d..ec12a81 100644 --- a/integration-tests/tracing-tests/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestMain.java +++ b/integration-tests/tracing-tests/src/test/java/org/apache/servicecomb/tests/tracing/TracingTestMain.java @@ -18,12 +18,10 @@ package org.apache.servicecomb.tests.tracing; import org.apache.servicecomb.foundation.common.utils.BeanUtils; -import org.apache.servicecomb.foundation.common.utils.Log4jUtils; public class TracingTestMain { - public static void main(String[] args) throws Exception { - Log4jUtils.init(); + public static void main(String[] args) { BeanUtils.init(); } } diff --git a/integration-tests/tracing-tests/src/test/resources/config/log4j.z.properties b/integration-tests/tracing-tests/src/test/resources/config/log4j.z.properties deleted file mode 100644 index 02401e6..0000000 --- a/integration-tests/tracing-tests/src/test/resources/config/log4j.z.properties +++ /dev/null @@ -1,21 +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. -# -log4j.logger.runLogger=WARN -log4j.rootLogger=WARN,paas,stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
