未验证 提交 f9b7fd3c 编写于 作者: L Liang Zhang 提交者: GitHub

Update logback-test.xml (#6921)

* Move conf.prop

* Update logback-test.xml
上级 4c954212
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,7 +22,7 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.core.execute.threadlocal.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -17,9 +17,6 @@
package org.apache.shardingsphere.masterslave.spring.boot;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.masterslave.algorithm.config.AlgorithmProvidedMasterSlaveRuleConfiguration;
import org.apache.shardingsphere.masterslave.spi.MasterSlaveLoadBalanceAlgorithm;
......@@ -34,6 +31,10 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
/**
* Rule spring boot configuration for master-slave.
*/
......
......@@ -17,7 +17,6 @@
package org.apache.shardingsphere.masterslave.spring.boot;
import javax.annotation.Resource;
import org.apache.shardingsphere.masterslave.spring.boot.fixture.RandomMasterSlaveLoadBalanceAlgorithmFixture;
import org.junit.Test;
import org.junit.runner.RunWith;
......@@ -27,6 +26,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.annotation.Resource;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.core.execute.threadlocal.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
<?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>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<root>
<level value="error" />
<appender-ref ref="console" />
</root>
</configuration>
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,14 +22,12 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.core.execute.threadlocal.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
<appender-ref ref="console" />
</root>
</configuration>
</configuration>
......@@ -25,7 +25,6 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,7 +22,7 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="com.zaxxer.hikari.HikariConfig" level="warn" />
......
......@@ -22,11 +22,10 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.resourced.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.resourced.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,10 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.infra.executor.sql.resourced.jdbc.executor.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -25,7 +25,6 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.core.execute.threadlocal.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -36,7 +36,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/encrypt
http://shardingsphere.apache.org/schema/shardingsphere/encrypt/encrypt.xsd
">
<context:property-placeholder location="classpath:conf/rdb/conf.properties" />
<context:property-placeholder location="classpath:conf/conf.properties" />
<bean id="ds_0_master" class="org.apache.shardingsphere.test.MockedDataSource" />
<bean id="ds_0_slave_0" class="org.apache.shardingsphere.test.MockedDataSource" />
......
......@@ -22,11 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.core.execute.threadlocal.ExecutorExceptionHandler" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -25,7 +25,6 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -25,7 +25,6 @@
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,10 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.transaction.xa.manager.XATransactionManagerLoader" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,10 +22,9 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
......@@ -22,11 +22,10 @@
<pattern>[%-5level] %d{HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<logger name="org.apache.shardingsphere" level="info" additivity="false">
<logger name="org.apache.shardingsphere" level="warn" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="org.apache.shardingsphere.transaction.ShardingTransactionManagerEngine" level="off" />
<logger name="ShardingSphere-metadata" level="off" />
<root>
<level value="error" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册