From 57d6cd9e81798d6f01a13164e078fabee9891403 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Mon, 18 Feb 2019 09:35:34 +0800
Subject: [PATCH] admin rpc timeout change to 5000ms; thread name optimize

---
 .../com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java | 2 +-
 .../com/xxl/job/admin/core/thread/JobFailMonitorHelper.java     | 1 +
 .../com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java | 1 +
 .../java/com/xxl/job/core/thread/ExecutorRegistryThread.java    | 1 +
 .../java/com/xxl/job/core/thread/JobLogFileCleanThread.java     | 1 +
 .../java/com/xxl/job/core/thread/TriggerCallbackThread.java     | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
index 5dd891a8..215c6c9e 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java
@@ -144,7 +144,7 @@ public final class XxlJobDynamicScheduler {
                 LoadBalance.ROUND,
                 ExecutorBiz.class,
                 null,
-                10000,
+                5000,
                 address,
                 XxlJobAdminConfig.getAdminConfig().getAccessToken(),
                 null,
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
index 0ef82b3e..f2746bf8 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
@@ -98,6 +98,7 @@ public class JobFailMonitorHelper {
 			}
 		});
 		monitorThread.setDaemon(true);
+		monitorThread.setName("xxl-job, admin JobFailMonitorHelper");
 		monitorThread.start();
 	}
 
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
index 9cf051d4..0415c530 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
@@ -90,6 +90,7 @@ public class JobRegistryMonitorHelper {
 			}
 		});
 		registryThread.setDaemon(true);
+		registryThread.setName("xxl-job, admin JobRegistryMonitorHelper");
 		registryThread.start();
 	}
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
index 57bdb15a..fd3b979d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
@@ -100,6 +100,7 @@ public class ExecutorRegistryThread extends Thread {
             }
         });
         registryThread.setDaemon(true);
+        registryThread.setName("xxl-job, executor ExecutorRegistryThread");
         registryThread.start();
     }
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
index dbe56e5b..3188ca34 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
@@ -101,6 +101,7 @@ public class JobLogFileCleanThread extends Thread {
             }
         });
         localThread.setDaemon(true);
+        localThread.setName("xxl-job, executor JobLogFileCleanThread");
         localThread.start();
     }
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
index 9fba156d..69b41191 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
@@ -99,6 +99,7 @@ public class TriggerCallbackThread {
             }
         });
         triggerCallbackThread.setDaemon(true);
+        triggerCallbackThread.setName("xxl-job, executor TriggerCallbackThread");
         triggerCallbackThread.start();