This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new c9f9059b5 Add NopStatusListener in logback-test.xml
new caef949e8 Merge pull request #2309 from terrymanu/dev
c9f9059b5 is described below
commit c9f9059b5cdbaeb5e8c50c15bcd7aaf61d673f5c
Author: zhangliang <[email protected]>
AuthorDate: Tue Oct 24 10:21:19 2023 +0800
Add NopStatusListener in logback-test.xml
---
.../error-handler/type/dingtalk/src/test/resources/logback-test.xml | 1 +
.../error-handler/type/email/src/test/resources/logback-test.xml | 1 +
.../error-handler/type/general/src/test/resources/logback-test.xml | 1 +
.../error-handler/type/wechat/src/test/resources/logback-test.xml | 1 +
ecosystem/tracing/api/src/test/resources/logback-test.xml | 2 ++
ecosystem/tracing/rdb/src/test/resources/logback-test.xml | 2 ++
infra/src/test/resources/logback-test.xml | 2 ++
kernel/src/test/resources/logback-test.xml | 2 ++
lifecycle/src/test/resources/logback-test.xml | 2 ++
.../provider/zookeeper-curator/src/test/resources/logback-test.xml | 2 ++
.../elasticjob/spring/boot/job/ElasticJobSpringBootTest.java | 5 ++---
spring/boot-starter/src/test/resources/logback-test.xml | 2 ++
spring/core/src/test/resources/META-INF/logback-test.xml | 2 ++
spring/namespace/src/test/resources/logback-test.xml | 2 ++
14 files changed, 24 insertions(+), 3 deletions(-)
diff --git
a/ecosystem/error-handler/type/dingtalk/src/test/resources/logback-test.xml
b/ecosystem/error-handler/type/dingtalk/src/test/resources/logback-test.xml
index a33f47dff..df652e016 100644
--- a/ecosystem/error-handler/type/dingtalk/src/test/resources/logback-test.xml
+++ b/ecosystem/error-handler/type/dingtalk/src/test/resources/logback-test.xml
@@ -17,6 +17,7 @@
-->
<configuration>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<appender name="DingtalkJobErrorHandlerTestAppender"
class="ch.qos.logback.core.read.ListAppender" />
<logger
name="org.apache.shardingsphere.elasticjob.error.handler.dingtalk.DingtalkJobErrorHandler"
level="info" additivity="false">
<appender-ref ref="DingtalkJobErrorHandlerTestAppender" />
diff --git
a/ecosystem/error-handler/type/email/src/test/resources/logback-test.xml
b/ecosystem/error-handler/type/email/src/test/resources/logback-test.xml
index dafd4e306..3d2812690 100644
--- a/ecosystem/error-handler/type/email/src/test/resources/logback-test.xml
+++ b/ecosystem/error-handler/type/email/src/test/resources/logback-test.xml
@@ -17,6 +17,7 @@
-->
<configuration>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<appender name="EmailJobErrorHandlerTestAppender"
class="ch.qos.logback.core.read.ListAppender" />
<logger
name="org.apache.shardingsphere.elasticjob.error.handler.email.EmailJobErrorHandler"
level="info" additivity="false">
<appender-ref ref="EmailJobErrorHandlerTestAppender" />
diff --git
a/ecosystem/error-handler/type/general/src/test/resources/logback-test.xml
b/ecosystem/error-handler/type/general/src/test/resources/logback-test.xml
index a0c3fbb71..daeed13ad 100644
--- a/ecosystem/error-handler/type/general/src/test/resources/logback-test.xml
+++ b/ecosystem/error-handler/type/general/src/test/resources/logback-test.xml
@@ -17,6 +17,7 @@
-->
<configuration>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<appender name="LogJobErrorHandlerTestAppender"
class="ch.qos.logback.core.read.ListAppender" />
<logger
name="org.apache.shardingsphere.elasticjob.error.handler.general.LogJobErrorHandler"
level="error" additivity="false">
<appender-ref ref="LogJobErrorHandlerTestAppender" />
diff --git
a/ecosystem/error-handler/type/wechat/src/test/resources/logback-test.xml
b/ecosystem/error-handler/type/wechat/src/test/resources/logback-test.xml
index 624641fd5..c4ade4bd4 100644
--- a/ecosystem/error-handler/type/wechat/src/test/resources/logback-test.xml
+++ b/ecosystem/error-handler/type/wechat/src/test/resources/logback-test.xml
@@ -17,6 +17,7 @@
-->
<configuration>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
<appender name="WechatJobErrorHandlerTestAppender"
class="ch.qos.logback.core.read.ListAppender" />
<logger
name="org.apache.shardingsphere.elasticjob.error.handler.wechat.WechatJobErrorHandler"
level="info" additivity="false">
<appender-ref ref="WechatJobErrorHandlerTestAppender" />
diff --git a/ecosystem/tracing/api/src/test/resources/logback-test.xml
b/ecosystem/tracing/api/src/test/resources/logback-test.xml
index ee3f508d5..3e655a24d 100644
--- a/ecosystem/tracing/api/src/test/resources/logback-test.xml
+++ b/ecosystem/tracing/api/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
index 17942473e..01eb3fb3a 100644
--- a/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
+++ b/ecosystem/tracing/rdb/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git a/infra/src/test/resources/logback-test.xml
b/infra/src/test/resources/logback-test.xml
index 0184fdda6..57283bfca 100644
--- a/infra/src/test/resources/logback-test.xml
+++ b/infra/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git a/kernel/src/test/resources/logback-test.xml
b/kernel/src/test/resources/logback-test.xml
index bbddeff36..72a2eade8 100644
--- a/kernel/src/test/resources/logback-test.xml
+++ b/kernel/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git a/lifecycle/src/test/resources/logback-test.xml
b/lifecycle/src/test/resources/logback-test.xml
index 0e0ccda83..1e0e6dafc 100644
--- a/lifecycle/src/test/resources/logback-test.xml
+++ b/lifecycle/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git
a/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
b/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
index 28c1cb65c..85f1d61dd 100644
---
a/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
+++
b/registry-center/provider/zookeeper-curator/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
diff --git
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
index 4decf2434..6774eb45c 100644
---
a/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
+++
b/spring/boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/spring/boot/job/ElasticJobSpringBootTest.java
@@ -23,11 +23,11 @@ import
org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.JobBootstrap;
import
org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.OneOffJobBootstrap;
import
org.apache.shardingsphere.elasticjob.kernel.api.bootstrap.impl.ScheduleJobBootstrap;
import
org.apache.shardingsphere.elasticjob.kernel.internal.schedule.JobScheduler;
+import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
import
org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.EmbedTestingServer;
import
org.apache.shardingsphere.elasticjob.spring.boot.job.fixture.job.impl.CustomTestJob;
import
org.apache.shardingsphere.elasticjob.spring.boot.reg.ZookeeperProperties;
import
org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties;
-import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeAll;
@@ -48,7 +48,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -122,7 +121,7 @@ class ElasticJobSpringBootTest {
assertThat(customTestJobProperties.getShardingTotalCount(), is(3));
assertNull(customTestJobProperties.getElasticJobType());
assertThat(customTestJobProperties.getJobListenerTypes().size(),
is(2));
- assertThat(customTestJobProperties.getJobListenerTypes(),
equalTo(Arrays.asList("NOOP", "LOG")));
+ assertThat(customTestJobProperties.getJobListenerTypes(),
is(Arrays.asList("NOOP", "LOG")));
ElasticJobConfigurationProperties printTestJobProperties =
elasticJobProperties.getJobs().get("printTestJob");
assertNotNull(printTestJobProperties);
assertNull(printTestJobProperties.getElasticJobClass());
diff --git a/spring/boot-starter/src/test/resources/logback-test.xml
b/spring/boot-starter/src/test/resources/logback-test.xml
index 63d470321..65c90ee7c 100644
--- a/spring/boot-starter/src/test/resources/logback-test.xml
+++ b/spring/boot-starter/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="${log.charset}">
<pattern>${log.pattern}</pattern>
diff --git a/spring/core/src/test/resources/META-INF/logback-test.xml
b/spring/core/src/test/resources/META-INF/logback-test.xml
index 9d1601c9f..c169e22ca 100644
--- a/spring/core/src/test/resources/META-INF/logback-test.xml
+++ b/spring/core/src/test/resources/META-INF/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="${log.charset}">
<pattern>${log.pattern}</pattern>
diff --git a/spring/namespace/src/test/resources/logback-test.xml
b/spring/namespace/src/test/resources/logback-test.xml
index 9d1601c9f..c169e22ca 100644
--- a/spring/namespace/src/test/resources/logback-test.xml
+++ b/spring/namespace/src/test/resources/logback-test.xml
@@ -23,6 +23,8 @@
<contextName>${log.context.name}</contextName>
+ <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="${log.charset}">
<pattern>${log.pattern}</pattern>
