[shardingsphere] branch master updated: Change proxy log print at Docker images, get more information (#17788)

[zhonghongsheng]

This is an automated email from the ASF dual-hosted git repository.

zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new b1ab859bf0d Change proxy log print at Docker images, get more 
information (#17788)
b1ab859bf0d is described below

commit b1ab859bf0d91b3d4a8282485a9fafd71f56aa4c
Author: azexcy <101622833+aze...@users.noreply.github.com>
AuthorDate: Wed May 18 21:05:44 2022 +0800

    Change proxy log print at Docker images, get more information (#17788)
---
 .../integration/data/pipeline/cases/base/BaseITCase.java       |  3 ---
 .../framework/container/compose/DockerComposedContainer.java   |  1 -
 .../src/test/resources/env/logback.xml                         | 10 ++++++++--
 .../src/test/resources/logback-test.xml                        |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
index 6a6cd6b44ea..71bd556018b 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/cases/base/BaseITCase.java
@@ -265,9 +265,6 @@ public abstract class BaseITCase {
     
     @After
     public void stopContainer() {
-        if (composedContainer instanceof DockerComposedContainer) {
-            log.info(((DockerComposedContainer) 
composedContainer).getProxyContainer().getLogs());
-        }
         composedContainer.stop();
     }
 }
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
index 0c8439fba06..48f82b64a0a 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/compose/DockerComposedContainer.java
@@ -51,6 +51,5 @@ public final class DockerComposedContainer extends 
BaseComposedContainer {
     @Override
     public String getProxyJdbcUrl(final String databaseName) {
         return 
getDatabaseContainer().getJdbcUrl(getProxyContainer().getHost(), 
getProxyContainer().getFirstMappedPort(), databaseName);
-        
     }
 }
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/logback.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/logback.xml
index fba0d761476..7597a483675 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/logback.xml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/logback.xml
@@ -22,10 +22,16 @@
             <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] 
%logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <logger name="org.apache.shardingsphere" level="WARN" additivity="false">
+    <logger name="org.apache.shardingsphere.mode" level="INFO" 
additivity="false">
         <appender-ref ref="console" />
     </logger>
-    
+    <logger name="org.apache.shardingsphere.data.pipeline" level="INFO" 
additivity="false">
+        <appender-ref ref="console" />
+    </logger>
+    <logger name="org.apache.shardingsphere.driver" level="INFO" 
additivity="false">
+        <appender-ref ref="console" />
+    </logger>
+    <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
     <root>
         <level value="WARN" />
         <appender-ref ref="console" />
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
index 0b3462ef748..b13e574bb64 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/logback-test.xml
@@ -25,7 +25,7 @@
     <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG" 
additivity="false">
         <appender-ref ref="console" />
     </logger>
-    <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="ERROR" />
+    <logger name="com.zaxxer.hikari.pool.ProxyConnection" level="OFF" />
     <root level="INFO">
         <appender-ref ref="console" />
     </root>