From 2f1dda694638e3349461907aaf81642f373eea20 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Mon, 18 Feb 2019 13:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=9B=9E=E8=B0=83=E3=80=81?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BC=98=E5=8C=96=EF=BC=8C=E9=9D=9E=E6=A0=B8=E5=BF=83?= =?UTF-8?q?=E5=B8=B8=E8=A7=84=E6=97=A5=E5=BF=97=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?debug=E7=BA=A7=E5=88=AB=EF=BC=8C=E9=99=8D=E4=BD=8E=E5=86=97?= =?UTF-8?q?=E4=BD=99=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 2 +- .../xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java | 2 +- .../com/xxl/job/core/thread/ExecutorRegistryThread.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 2ed5f6a2..1e62d97b 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1421,7 +1421,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 7、交互优化，尽量避免新开页面窗口；仅WebIDE支持新开页，并提供窗口快速关闭按钮； - 8、[测试中]底层通讯方案优化：升级较新版本xxl-rpc，由"JETTY"方案调整为"NETTY_HTTP"方案，执行器内嵌netty-http-server提供服务，调度中心复用容器端口提供服务； - 9、任务暂停、删除优化，避免quartz delete不完整导致任务脏数据； -- 10、任务回调日志优化，调整为debug级别，降低冗余日志输出； +- 10、任务回调、心跳注册成功日志优化，非核心常规日志调整为debug级别，降低冗余日志输出； - [迭代中]注册中心优化，实时性注册发现：心跳注册间隔10s，refresh失败则首次注册并立即更新注册信息，心跳类似；30s过期销毁； - [迭代中]脚本任务，支持数据参数，新版本仅支持单参数不支持需要兼容； - [迭代中]提供执行器Docker镜像； 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 7e83ba26..6056a36e 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 @@ -253,7 +253,7 @@ public final class XxlJobDynamicScheduler { scheduler.unscheduleJob(triggerKey); // trigger + job }*/ - logger.info(">>>>>>>>>>> removeJob success(quartz), triggerKey:{}", jobKey); + logger.info(">>>>>>>>>>> removeJob success(quartz), jobKey:{}", jobKey); return true; } 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 fd3b979d..fddacc30 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 @@ -48,7 +48,7 @@ public class ExecutorRegistryThread extends Thread { ReturnT registryResult = adminBiz.registry(registryParam); if (registryResult!=null && ReturnT.SUCCESS_CODE == registryResult.getCode()) { registryResult = ReturnT.SUCCESS; - logger.info(">>>>>>>>>>> xxl-job registry success, registryParam:{}, registryResult:{}", new Object[]{registryParam, registryResult}); + logger.debug(">>>>>>>>>>> xxl-job registry success, registryParam:{}, registryResult:{}", new Object[]{registryParam, registryResult}); break; } else { logger.info(">>>>>>>>>>> xxl-job registry fail, registryParam:{}, registryResult:{}", new Object[]{registryParam, registryResult}); @@ -66,7 +66,9 @@ public class ExecutorRegistryThread extends Thread { } try { - TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); + if (!toStop) { + TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); + } } catch (InterruptedException e) { if (!toStop) { logger.warn(">>>>>>>>>>> xxl-job, executor registry thread interrupted, error msg:{}", e.getMessage());