You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/10/19 10:55:17 UTC
[shardingsphere-elasticjob] branch master updated: Remove default
value of error handler (#1598)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 f5e94be Remove default value of error handler (#1598)
f5e94be is described below
commit f5e94be6b1bc9c8a4b6a288efe37c03579fc3c60
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Oct 19 18:55:08 2020 +0800
Remove default value of error handler (#1598)
* refactor ElasticJobLiteAutoConfiguration
* Remove default value of error handler
---
.../built-in-strategy/error-handler.cn.md | 50 +++++++++++-----------
.../built-in-strategy/error-handler.en.md | 50 +++++++++++-----------
.../boot/job/ElasticJobLiteAutoConfiguration.java | 10 ++---
.../resources/META-INF/namespace/elasticjob.xsd | 12 +++---
4 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
index ab14941..a47e0a8 100644
--- a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
+++ b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
@@ -47,19 +47,19 @@ Maven 坐标：
可配置属性：
-| 属性名 | 说明 | 默认值 |
-| -------- |:----------- |:------------------------ |
-| host | TODO | 无 |
-| port | TODO | 无 |
-| username | TODO | 无 |
-| password | TODO | 无 |
-| useSsl | TODO | 无 |
-| subject | TODO | ElasticJob error message |
-| from | TODO | 无 |
-| to | TODO | 无 |
-| cc | TODO | 无 |
-| bcc | TODO | 无 |
-| debug | TODO | 无 |
+| 属性名 | 说明 |
+| -------- |:----------- |
+| host | TODO |
+| port | TODO |
+| username | TODO |
+| password | TODO |
+| useSsl | TODO |
+| subject | TODO |
+| from | TODO |
+| to | TODO |
+| cc | TODO |
+| bcc | TODO |
+| debug | TODO |
## 企业微信通知策略
@@ -81,11 +81,11 @@ Maven 坐标：
可配置属性：
-| 属性名 | 说明 | 默认值 |
-| ------------------------- |:----------- |:-------- |
-| webhook | TODO | 无 |
-| connectTimeoutMillisecond | TODO | 3000 毫秒 |
-| readTimeoutMillisecond | TODO | 5000 毫秒 |
+| 属性名 | 说明 |
+| ------------------------- |:----------- |
+| webhook | TODO |
+| connectTimeoutMillisecond | TODO |
+| readTimeoutMillisecond | TODO |
## 钉钉通知策略
@@ -107,10 +107,10 @@ Maven 坐标：
可配置属性：
-| 属性名 | 说明 | 默认值 |
-| ------------------------- |:----------- |:-------- |
-| webhook | TODO | 无 |
-| keyword | TODO | 无 |
-| secret | TODO | 无 |
-| connectTimeoutMillisecond | TODO | 3000 毫秒 |
-| readTimeoutMillisecond | TODO | 5000 毫秒 |
+| 属性名 | 说明 |
+| ------------------------- |:----------- |
+| webhook | TODO |
+| keyword | TODO |
+| secret | TODO |
+| connectTimeoutMillisecond | TODO |
+| readTimeoutMillisecond | TODO |
diff --git a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
index 6ff98bd..c75fbb7 100644
--- a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
+++ b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
@@ -47,19 +47,19 @@ Maven POM:
Configuration:
-| Name | Description | Default Value |
-| -------- |:----------- |:------------------------ |
-| host | TODO | None |
-| port | TODO | None |
-| username | TODO | None |
-| password | TODO | None |
-| useSsl | TODO | None |
-| subject | TODO | ElasticJob error message |
-| from | TODO | None |
-| to | TODO | None |
-| cc | TODO | None |
-| bcc | TODO | None |
-| debug | TODO | None |
+| Name | Description |
+| -------- |:----------- |
+| host | TODO |
+| port | TODO |
+| username | TODO |
+| password | TODO |
+| useSsl | TODO |
+| subject | TODO |
+| from | TODO |
+| to | TODO |
+| cc | TODO |
+| bcc | TODO |
+| debug | TODO |
## Wechat Enterprise Notification Strategy
@@ -81,11 +81,11 @@ Maven POM:
Configuration:
-| Name | Description | Default Value |
-| ------------------------- |:----------- |:----------------- |
-| webhook | TODO | None |
-| connectTimeoutMillisecond | TODO | 3000 milliseconds |
-| readTimeoutMillisecond | TODO | 5000 milliseconds |
+| Name | Description |
+| ------------------------- |:----------- |
+| webhook | TODO |
+| connectTimeoutMillisecond | TODO |
+| readTimeoutMillisecond | TODO |
## Dingtalk Notification Strategy
@@ -107,10 +107,10 @@ Maven POM:
Configuration:
-| Name | Description | Default Value |
-| ------------------------- |:----------- |:----------------- |
-| webhook | TODO | None |
-| keyword | TODO | None |
-| secret | TODO | None |
-| connectTimeoutMillisecond | TODO | 3000 milliseconds |
-| readTimeoutMillisecond | TODO | 5000 milliseconds |
+| Name | Description |
+| ------------------------- |:----------- |
+| webhook | TODO |
+| keyword | TODO |
+| secret | TODO |
+| connectTimeoutMillisecond | TODO |
+| readTimeoutMillisecond | TODO |
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
index b4a94c9..ab293b5 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
@@ -66,8 +66,8 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
ElasticJobProperties elasticJobProperties = applicationContext.getBean(ElasticJobProperties.class);
SingletonBeanRegistry singletonBeanRegistry = ((ConfigurableApplicationContext) applicationContext).getBeanFactory();
CoordinatorRegistryCenter registryCenter = applicationContext.getBean(CoordinatorRegistryCenter.class);
- TracingConfiguration tracingConfiguration = getTracingConfiguration();
- constructJobBootstraps(elasticJobProperties, singletonBeanRegistry, registryCenter, tracingConfiguration);
+ TracingConfiguration tracingConfig = getTracingConfiguration();
+ constructJobBootstraps(elasticJobProperties, singletonBeanRegistry, registryCenter, tracingConfig);
}
private TracingConfiguration getTracingConfiguration() {
@@ -84,7 +84,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
}
private void constructJobBootstraps(final ElasticJobProperties elasticJobProperties, final SingletonBeanRegistry singletonBeanRegistry,
- final CoordinatorRegistryCenter registryCenter, final TracingConfiguration tracingConfiguration) {
+ final CoordinatorRegistryCenter registryCenter, final TracingConfiguration tracingConfig) {
for (Entry<String, ElasticJobConfigurationProperties> entry : elasticJobProperties.getJobs().entrySet()) {
ElasticJobConfigurationProperties jobConfigurationProperties = entry.getValue();
Preconditions.checkArgument(null != jobConfigurationProperties.getElasticJobClass()
@@ -94,9 +94,9 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
|| Strings.isNullOrEmpty(jobConfigurationProperties.getElasticJobType()),
"[elasticJobClass] and [elasticJobType] are mutually exclusive.");
if (null != jobConfigurationProperties.getElasticJobClass()) {
- registerClassedJob(entry.getKey(), entry.getValue().getJobBootstrapBeanName(), singletonBeanRegistry, registryCenter, tracingConfiguration, jobConfigurationProperties);
+ registerClassedJob(entry.getKey(), entry.getValue().getJobBootstrapBeanName(), singletonBeanRegistry, registryCenter, tracingConfig, jobConfigurationProperties);
} else if (!Strings.isNullOrEmpty(jobConfigurationProperties.getElasticJobType())) {
- registerTypedJob(entry.getKey(), entry.getValue().getJobBootstrapBeanName(), singletonBeanRegistry, registryCenter, tracingConfiguration, jobConfigurationProperties);
+ registerTypedJob(entry.getKey(), entry.getValue().getJobBootstrapBeanName(), singletonBeanRegistry, registryCenter, tracingConfig, jobConfigurationProperties);
}
}
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
index 2f56716..c9aa306 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
@@ -91,13 +91,13 @@
<xsd:attribute name="port" type="xsd:string" use="required" />
<xsd:attribute name="username" type="xsd:string" use="required" />
<xsd:attribute name="password" type="xsd:string" use="required" />
- <xsd:attribute name="use-ssl" type="xsd:string" default="true" />
+ <xsd:attribute name="use-ssl" type="xsd:string" use="required" />
<xsd:attribute name="subject" type="xsd:string" use="required" />
<xsd:attribute name="from" type="xsd:string" use="required" />
<xsd:attribute name="to" type="xsd:string" use="required" />
<xsd:attribute name="cc" type="xsd:string" use="required" />
<xsd:attribute name="bcc" type="xsd:string" use="required" />
- <xsd:attribute name="debug" type="xsd:string" default="false" />
+ <xsd:attribute name="debug" type="xsd:string" use="required" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -108,8 +108,8 @@
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:attribute name="webhook" type="xsd:string" use="required" />
- <xsd:attribute name="connect-timeout-millisecond" type="xsd:string" default="3000" />
- <xsd:attribute name="read-timeout-millisecond" type="xsd:string" default="5000" />
+ <xsd:attribute name="connect-timeout-millisecond" type="xsd:string" use="required" />
+ <xsd:attribute name="read-timeout-millisecond" type="xsd:string" use="required" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -122,8 +122,8 @@
<xsd:attribute name="webhook" type="xsd:string" use="required" />
<xsd:attribute name="keyword" type="xsd:string" use="required" />
<xsd:attribute name="secret" type="xsd:string" use="required" />
- <xsd:attribute name="connect-timeout-millisecond" type="xsd:string" default="3000" />
- <xsd:attribute name="read-timeout-millisecond" type="xsd:string" default="5000" />
+ <xsd:attribute name="connect-timeout-millisecond" type="xsd:string" use="required" />
+ <xsd:attribute name="read-timeout-millisecond" type="xsd:string" use="required" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>