diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java new file mode 100644 index 000000000..fcb244339 --- /dev/null +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobInitConfiguration.java @@ -0,0 +1,26 @@ +package com.xxl.job.admin.config; + +import com.xxl.job.admin.core.conf.XxlJobAdminConfig; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import org.springframework.boot.web.context.WebServerInitializedEvent; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.event.EventListener; + +/** + * @author lengleng + * @date 2022/2/28 + */ +@RequiredArgsConstructor +@Configuration(proxyBeanMethods = false) +public class XxlJobInitConfiguration { + + private final XxlJobAdminConfig xxlJobAdminConfig; + + @SneakyThrows + @EventListener({ WebServerInitializedEvent.class }) + public void init() { + xxlJobAdminConfig.getXxlJobScheduler().init(); + } + +} diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java index 36aff95a3..db3190794 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java @@ -37,7 +37,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean { adminConfig = this; xxlJobScheduler = new XxlJobScheduler(); - xxlJobScheduler.init(); +// xxlJobScheduler.init(); } @Override @@ -160,4 +160,7 @@ public class XxlJobAdminConfig implements InitializingBean, DisposableBean { return jobAlarmer; } + public XxlJobScheduler getXxlJobScheduler() { + return xxlJobScheduler; + } } diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java index bb7ee7f5e..d2c7c38e4 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java @@ -99,7 +99,7 @@ public class JobLogReportHelper { } catch (Exception e) { if (!toStop) { - logger.error(">>>>>>>>>>> xxl-job, job log report thread error"); + logger.error(">>>>>>>>>>> xxl-job, job log report thread error:{}", e); } } @@ -137,7 +137,7 @@ public class JobLogReportHelper { } catch (Exception e) { if (!toStop) { - logger.error(e.getMessage()); + logger.error(e.getMessage(), e); } }