From 563704d5883df0943666682808e6d481cd76cd6a Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Wed, 21 Sep 2022 22:20:31 +0800 Subject: [PATCH] =?UTF-8?q?JobExecutor=E4=BD=BF=E7=94=A8=E7=AE=80=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84=E7=BA=BF=E7=A8=8B=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/fun/asgc/neutrino/core/quartz/JobExecutor.java | 9 ++++++++- .../proxy/server/base/rest/config/JobConfig.java | 2 -- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java index bb6e42a9..a50f2ab0 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java @@ -23,6 +23,7 @@ package fun.asgc.neutrino.core.quartz; import com.google.common.collect.Sets; import fun.asgc.neutrino.core.annotation.Autowired; +import fun.asgc.neutrino.core.base.CustomThreadFactory; import fun.asgc.neutrino.core.context.ApplicationRunner; import fun.asgc.neutrino.core.context.Environment; import fun.asgc.neutrino.core.quartz.annotation.JobHandler; @@ -37,7 +38,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * Job执行器 @@ -60,9 +63,13 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor { @Override public void run(String[] args) throws JobException { - if (!environment.isEnableJob() || null == jobSource || null == threadPoolExecutor) { + if (!environment.isEnableJob() || null == jobSource) { return; } + if (null == threadPoolExecutor) { + threadPoolExecutor = new ThreadPoolExecutor(5, 20, 10L, TimeUnit.SECONDS, + new LinkedBlockingQueue<>(), new CustomThreadFactory("DefaultJobPool")); + } List jobHandlerList = BeanManager.getBeanListBySuperClass(IJobHandler.class); if (!CollectionUtil.isEmpty(jobHandlerList)) { diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java index 749de7c9..e4e78372 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java @@ -49,8 +49,6 @@ public class JobConfig { public JobExecutor jobExecutor() { JobExecutor executor = new JobExecutor(); executor.setJobSource(jobInfoService); - executor.setThreadPoolExecutor(new ThreadPoolExecutor(5, 20, 10L, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(), new CustomThreadFactory("JobPool"))); executor.setJobCallback(jobLogService); return executor; }