Merge pull request #31 from WeiYe-Jing/dev

Dev
WeiYe-Jing · Jul 12, 2020 · 9037c4d · 9037c4d
2 parents 1dbe8a8 + 8448848
commit 9037c4d
Show file tree

Hide file tree

Showing 28 changed files with 527 additions and 584 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,10 @@
 /datax-executor/target/
-/datax-executor/datax-executor.iml
-/datax-core/datax-core.iml
 /datax-core/target/
-/datax-admin/datax-admin.iml
 /datax-admin/target/
 /.idea/
 /datax-admin/.idea/
 /datax-registry/datax-registry.iml
 /datax-registry/target/
-/datax-rpc/datax-rpc.iml
 /datax-rpc/target/
 /datax-all.iml
 /logs/

diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/core/util/CookieUtil.java b/datax-admin/src/main/java/com/wugui/datax/admin/core/util/CookieUtil.java
diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/MyAccessDecisionManager.java b/datax-admin/src/main/java/com/wugui/datax/admin/service/impl/MyAccessDecisionManager.java
diff --git a/...x-admin/src/main/java/com/wugui/datax/admin/service/impl/MyFilterSecurityInterceptor.java b/...x-admin/src/main/java/com/wugui/datax/admin/service/impl/MyFilterSecurityInterceptor.java
diff --git a/...in/java/com/wugui/datax/admin/service/impl/MyInvocationSecurityMetadataSourceService.java b/...in/java/com/wugui/datax/admin/service/impl/MyInvocationSecurityMetadataSourceService.java
diff --git a/datax-core/src/main/java/com/wugui/datatx/core/executor/JobExecutor.java b/datax-core/src/main/java/com/wugui/datatx/core/executor/JobExecutor.java
@@ -120,12 +120,7 @@ public void destroy() {
         TriggerCallbackThread.getInstance().toStop();
 
         // destory ProcessCallbackThread
-        try {
-            ProcessCallbackThread.getInstance().toStop();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
+        ProcessCallbackThread.getInstance().toStop();
     }
 
 

diff --git a/datax-core/src/main/java/com/wugui/datatx/core/executor/impl/JobSpringExecutor.java b/datax-core/src/main/java/com/wugui/datatx/core/executor/impl/JobSpringExecutor.java
@@ -73,7 +73,7 @@ private void initJobHandlerRepository(ApplicationContext applicationContext) {
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        applicationContext = applicationContext;
+        this.applicationContext = applicationContext;
     }
 
     public static ApplicationContext getApplicationContext() {

diff --git a/datax-core/src/main/java/com/wugui/datatx/core/thread/ProcessCallbackThread.java b/datax-core/src/main/java/com/wugui/datatx/core/thread/ProcessCallbackThread.java
@@ -125,18 +125,26 @@ public void start() {
 
     }
 
-    public void toStop() throws InterruptedException {
+    public void toStop() {
         toStop = true;
         // stop callback, interrupt and wait
-        // support empty admin address
-        if (processCallbackThread != null) {
+        if (processCallbackThread != null) {    // support empty admin address
             processCallbackThread.interrupt();
-            processCallbackThread.join();
+            try {
+                processCallbackThread.join();
+            } catch (InterruptedException e) {
+                logger.error(e.getMessage(), e);
+            }
         }
+
         // stop retry, interrupt and wait
         if (processRetryCallbackThread != null) {
             processRetryCallbackThread.interrupt();
-            processRetryCallbackThread.join();
+            try {
+                processRetryCallbackThread.join();
+            } catch (InterruptedException e) {
+                logger.error(e.getMessage(), e);
+            }
         }
     }