From 88fa256a29ee4ee84db0eb11434a9f48a1a625d1 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Tue, 26 Jul 2022 12:54:17 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=BC=E5=AE=B9=20log.autoBackConsoleC?= =?UTF-8?q?ron:=20none=20=E9=85=8D=E7=BD=AE=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ .../src/main/java/io/jpom/system/AgentExtConfigBean.java | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a2a80ab2..23eb7a0bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ 2. 【server】触发器 token 机制调整,取消 SHA256 生成。采用数据表单独存储 3. 【server】修复启动加载全局代理时机,避免（The database is not initialized） 4. 管理脚本执行支持环境变量配置 jvm、端口等，`JPOM_AGENT_JVM`,`JPOM_AGENT_PORT`,`JPOM_AGENT_ARGS`、`JPOM_SERVER_JVM`,`JPOM_SERVER_PORT`,`JPOM_SERVER_ARGS` （ 感谢@飞儿 ） +5. 【agent】兼容 `log.autoBackConsoleCron: none` 配置属性 ------ @@ -54,6 +55,10 @@ 4. 【server】修复编辑构建仓库切换事件重复问题 （感谢[@五六](https://gitee.com/tutu-father) [Gitee issues I5F35E](https://gitee.com/dromara/Jpom/issues/I5F35E) ） 5. 【server】修复 windows 执行脚本出现异常（感谢[@all-around-badass](https://gitee.com/all-around-badass) [Gitee issues I5FK0K](https://gitee.com/dromara/Jpom/issues/I5FK0K) ） +### ❌ 不兼容事项 + +1. 插件端 `log.autoBackConsoleCron` 配置属性替换为：`log.autoBackToFile` + ------ ## 2.9.2 (2022-06-27) diff --git a/modules/agent/src/main/java/io/jpom/system/AgentExtConfigBean.java b/modules/agent/src/main/java/io/jpom/system/AgentExtConfigBean.java index a46d41b36b..6b313c288c 100644 --- a/modules/agent/src/main/java/io/jpom/system/AgentExtConfigBean.java +++ b/modules/agent/src/main/java/io/jpom/system/AgentExtConfigBean.java @@ -186,7 +186,13 @@ public int getLogSaveDays() { * @return 如果表达式配置为none 则不配置，重启也不备份 */ public boolean openLogBack() { - return Optional.ofNullable(autoBackToFile).orElse(true); + boolean newConfig = Optional.ofNullable(autoBackToFile).orElse(true); + if (newConfig) { + // 使用旧配置 + String cron = StrUtil.emptyToDefault(autoBackConsoleCron, "none"); + return !"none".equalsIgnoreCase(cron.trim()); + } + return false; // if(autoBackToFile==null || autoBackToFile){ // return // }