[shardingsphere-elasticjob] branch master updated: Override close method for implementations of JobErrorHandler (#1740)

[technoboy]

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

technoboy 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 48ea0f0  Override close method for implementations of JobErrorHandler 
(#1740)
48ea0f0 is described below

commit 48ea0f0c005356a02313f2d5bed629c672d4dac8
Author: 陈宏彪 <hombioc...@163.com>
AuthorDate: Sun Nov 29 10:29:35 2020 +0800

    Override close method for implementations of JobErrorHandler (#1740)
---
 .../handler/dingtalk/DingtalkJobErrorHandler.java     | 19 ++++++-------------
 .../error/handler/wechat/WechatJobErrorHandler.java   | 19 ++++++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git 
a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
 
b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
index dceaa32..175527e 100644
--- 
a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
+++ 
b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
@@ -72,19 +72,6 @@ public final class DingtalkJobErrorHandler implements 
JobErrorHandler {
         secret = props.getProperty(DingtalkPropertiesConstants.SECRET);
         connectTimeoutMilliseconds = 
Integer.parseInt(props.getProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
 DingtalkPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECONDS));
         readTimeoutMilliseconds = 
Integer.parseInt(props.getProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
 DingtalkPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECONDS));
-        registerShutdownHook();
-    }
-    
-    private void registerShutdownHook() {
-        Runtime.getRuntime().addShutdownHook(new 
Thread("DingtalkJobErrorHandler Shutdown-Hook") {
-            
-            @SneakyThrows
-            @Override
-            public void run() {
-                log.info("Shutting down HTTP client...");
-                httpclient.close();
-            }
-        });
     }
     
     @Override
@@ -155,4 +142,10 @@ public final class DingtalkJobErrorHandler implements 
JobErrorHandler {
     public String getType() {
         return "DINGTALK";
     }
+    
+    @SneakyThrows
+    @Override
+    public void close() {
+        httpclient.close();
+    }
 }
diff --git 
a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
 
b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
index 07babb6..64db934 100644
--- 
a/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
+++ 
b/elasticjob-ecosystem/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
@@ -58,19 +58,6 @@ public final class WechatJobErrorHandler implements 
JobErrorHandler {
         webhook = props.getProperty(WechatPropertiesConstants.WEBHOOK);
         connectTimeoutMilliseconds = 
Integer.parseInt(props.getProperty(WechatPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
 WechatPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECONDS));
         readTimeoutMilliseconds = 
Integer.parseInt(props.getProperty(WechatPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
 WechatPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECONDS));
-        registerShutdownHook();
-    }
-    
-    private void registerShutdownHook() {
-        Runtime.getRuntime().addShutdownHook(new Thread("WechatJobErrorHandler 
Shutdown-Hook") {
-            
-            @SneakyThrows
-            @Override
-            public void run() {
-                log.info("Shutting down HTTP client...");
-                httpclient.close();
-            }
-        });
     }
     
     @Override
@@ -119,4 +106,10 @@ public final class WechatJobErrorHandler implements 
JobErrorHandler {
     public String getType() {
         return "WECHAT";
     }
+    
+    @SneakyThrows
+    @Override
+    public void close() {
+        httpclient.close();
+    }
 }