Browse Source

任务回调、心跳注册成功日志优化,非核心常规日志调整为debug级别,降低冗余日志输出;

xuxueli 6 years ago
parent
commit
2f1dda6946

+ 1 - 1
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镜像;

+ 1 - 1
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;
     }
 

+ 4 - 2
xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java

@@ -48,7 +48,7 @@ public class ExecutorRegistryThread extends Thread {
                                 ReturnT<String> 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());