From 598b0102508c793db53db08a81761951516fda14 Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Tue, 14 Jul 2020 23:34:24 +0800
Subject: [PATCH] [opt] remove local and remote instance log clean config (use
 oms.instanceinfo.retention)

---
 .../server/service/timing/CleanService.java         | 13 +++++--------
 .../src/main/resources/application-daily.properties |  4 +---
 .../src/main/resources/application-pre.properties   |  4 +---
 .../main/resources/application-product.properties   |  4 +---
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
index 781dd5e5..da429f08 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
@@ -35,17 +35,14 @@ public class CleanService {
     @Resource
     private WorkflowInstanceInfoRepository workflowInstanceInfoRepository;
 
-    @Value("${oms.log.retention.local}")
-    private int localLogRetentionDay;
-    @Value("${oms.log.retention.remote}")
-    private int remoteLogRetentionDay;
+    @Value("${oms.instanceinfo.retention}")
+    private int instanceInfoRetentionDay;
+
     @Value("${oms.container.retention.local}")
     private int localContainerRetentionDay;
     @Value("${oms.container.retention.remote}")
     private int remoteContainerRetentionDay;
 
-    @Value("${oms.instanceinfo.retention}")
-    private int instanceInfoRetentionDay;
 
     private static final int TEMPORARY_RETENTION_DAY = 3;
 
@@ -65,12 +62,12 @@ public class CleanService {
         cleanWorkflowInstanceLog();
 
         // 释放磁盘空间
-        cleanLocal(OmsFileUtils.genLogDirPath(), localLogRetentionDay);
+        cleanLocal(OmsFileUtils.genLogDirPath(), instanceInfoRetentionDay);
         cleanLocal(OmsFileUtils.genContainerJarPath(), localContainerRetentionDay);
         cleanLocal(OmsFileUtils.genTemporaryPath(), TEMPORARY_RETENTION_DAY);
 
         // 删除 GridFS 过期文件
-        cleanRemote(GridFsManager.LOG_BUCKET, remoteLogRetentionDay);
+        cleanRemote(GridFsManager.LOG_BUCKET, instanceInfoRetentionDay);
         cleanRemote(GridFsManager.CONTAINER_BUCKET, remoteContainerRetentionDay);
     }
 
diff --git a/powerjob-server/src/main/resources/application-daily.properties b/powerjob-server/src/main/resources/application-daily.properties
index 87036311..f0870b5f 100644
--- a/powerjob-server/src/main/resources/application-daily.properties
+++ b/powerjob-server/src/main/resources/application-daily.properties
@@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 
 ####### 资源清理配置 #######
-oms.log.retention.local=1
-oms.log.retention.remote=1
+oms.instanceinfo.retention=1
 oms.container.retention.local=1
 oms.container.retention.remote=-1
-oms.instanceinfo.retention=1
 
 ####### 缓存配置 #######
 oms.instance.metadata.cache.size=1024
\ No newline at end of file
diff --git a/powerjob-server/src/main/resources/application-pre.properties b/powerjob-server/src/main/resources/application-pre.properties
index 5e2291d8..f2d33b88 100644
--- a/powerjob-server/src/main/resources/application-pre.properties
+++ b/powerjob-server/src/main/resources/application-pre.properties
@@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 
 ####### 资源清理配置 #######
-oms.log.retention.local=3
-oms.log.retention.remote=3
+oms.instanceinfo.retention=3
 oms.container.retention.local=3
 oms.container.retention.remote=-1
-oms.instanceinfo.retention=3
 
 ####### 缓存配置 #######
 oms.instance.metadata.cache.size=1024
\ No newline at end of file
diff --git a/powerjob-server/src/main/resources/application-product.properties b/powerjob-server/src/main/resources/application-product.properties
index 8df29624..0a4e2556 100644
--- a/powerjob-server/src/main/resources/application-product.properties
+++ b/powerjob-server/src/main/resources/application-product.properties
@@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 
 ####### 资源清理配置 #######
-oms.log.retention.local=7
-oms.log.retention.remote=7
+oms.instanceinfo.retention=7
 oms.container.retention.local=7
 oms.container.retention.remote=-1
-oms.instanceinfo.retention=3
 
 ####### 缓存配置 #######
 oms.instance.metadata.cache.size=2048
\ No newline at end of file