From 1e1d9e85e6d4d296b995dedc145ddedfefb0ff9f Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 22 Sep 2018 23:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E8=A7=A6=E5=8F=91=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/admin/core/thread/JobTriggerPoolHelper.java | 13 ++++++------- .../xxl/job/core/thread/TriggerCallbackThread.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java index 57844c59..a90c6bc2 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java @@ -21,15 +21,15 @@ public class JobTriggerPoolHelper { // ---------------------- trigger pool ---------------------- private ThreadPoolExecutor triggerPool = new ThreadPoolExecutor( - 20, + 50, 200, - 60L, + 30L, TimeUnit.SECONDS, - new LinkedBlockingQueue(100000), + new LinkedBlockingQueue(1000), new ThreadPoolExecutor.CallerRunsPolicy()); - public void addTrigger(final int jobId, final int failRetryCount, final TriggerTypeEnum triggerType){ + public void addTrigger(final int jobId, final int failRetryCount, final TriggerTypeEnum triggerType) { triggerPool.execute(new Runnable() { @Override public void run() { @@ -38,7 +38,7 @@ public class JobTriggerPoolHelper { }); } - public void stop(){ + public void stop() { //triggerPool.shutdown(); triggerPool.shutdownNow(); logger.info(">>>>>>>>> xxl-job trigger thread pool shutdown success."); @@ -49,7 +49,6 @@ public class JobTriggerPoolHelper { private static JobTriggerPoolHelper helper = new JobTriggerPoolHelper(); /** - * * @param jobId * @param failRetryCount * >=0: use this param @@ -60,7 +59,7 @@ public class JobTriggerPoolHelper { helper.addTrigger(jobId, failRetryCount, triggerType); } - public static void toStop(){ + public static void toStop() { helper.stop(); } 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 422c68a0..9002a122 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 @@ -178,7 +178,7 @@ public class TriggerCallbackThread { } - // ---------------------- fial-callback file TODO ---------------------- + // ---------------------- fail-callback file ---------------------- private static String failCallbackFileName = XxlJobFileAppender.getLogPath().concat(File.separator).concat("xxl-job-callback").concat(".log");