diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index b9c17dca..9d90b3b0 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1398,6 +1398,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 3、记住密码功能优化,选中时永久记住;非选中时关闭浏览器即登出; - 4、项目依赖升级至较新稳定版本,如spring、jackson、groovy、xxl-rpc等等; - 5、精简项目,取消第三方依赖,如 commons-collections4 ; +- 6、底层Log调优,应用正常终止取消异常栈信息打印; - [迭代中]注册中心优化,实时性注册发现:心跳注册间隔10s,refresh失败则首次注册并立即更新注册信息,心跳类似;30s过期销毁; - [迭代中]脚本任务,支持数据参数,新版本仅支持单参数不支持需要兼容; - [迭代中]提供执行器Docker镜像; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java index acea99fc..de96c2be 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java @@ -87,10 +87,14 @@ public class JobFailMonitorHelper { TimeUnit.SECONDS.sleep(10); } catch (Exception e) { - logger.error("job monitor error:{}", e); + if (!toStop) { + logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}", e); + } } } + logger.warn(">>>>>>>>>>> xxl-job, job fail monitor thread stop"); + } }); monitorThread.setDaemon(true); @@ -178,7 +182,7 @@ public class JobFailMonitorHelper { XxlJobAdminConfig.getAdminConfig().getMailSender().send(mimeMessage); } catch (Exception e) { - logger.error(">>>>>>>>>>> job monitor alarm email send error, JobLogId:{}", jobLog.getId(), e); + logger.error(">>>>>>>>>>> xxl-job, job fail alarm email send error, JobLogId:{}", jobLog.getId(), e); alarmResult = false; } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index 3856c991..0742b972 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -74,14 +74,19 @@ public class JobRegistryMonitorHelper { } } } catch (Exception e) { - logger.error("job registry instance error:{}", e); + if (!toStop) { + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + } } try { TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT); } catch (InterruptedException e) { - logger.error("job registry instance error:{}", e); + if (!toStop) { + logger.error(">>>>>>>>>>> xxl-job, job registry monitor thread error:{}", e); + } } } + logger.warn(">>>>>>>>>>> xxl-job, job registry monitor thread stop"); } }); registryThread.setDaemon(true);