third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[opt] remove local and remote instance log clean config (use oms.instanceinfo.retention)

Browse Source
This commit is contained in:
tjq 2020-07-14 23:34:24 +08:00
parent 40d5dfc549
commit 598b010250
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
View File

@ -35,17 +35,14 @@ public class CleanService {
@Resource @Resource
private WorkflowInstanceInfoRepository workflowInstanceInfoRepository; private WorkflowInstanceInfoRepository workflowInstanceInfoRepository;
@Value("${oms.log.retention.local}") @Value("${oms.instanceinfo.retention}")
private int localLogRetentionDay; private int instanceInfoRetentionDay;
@Value("${oms.log.retention.remote}")
private int remoteLogRetentionDay;
@Value("${oms.container.retention.local}") @Value("${oms.container.retention.local}")
private int localContainerRetentionDay; private int localContainerRetentionDay;
@Value("${oms.container.retention.remote}") @Value("${oms.container.retention.remote}")
private int remoteContainerRetentionDay; private int remoteContainerRetentionDay;
@Value("${oms.instanceinfo.retention}")
private int instanceInfoRetentionDay;
private static final int TEMPORARY_RETENTION_DAY = 3; private static final int TEMPORARY_RETENTION_DAY = 3;
@ -65,12 +62,12 @@ public class CleanService {
cleanWorkflowInstanceLog(); cleanWorkflowInstanceLog();
// 释放磁盘空间 // 释放磁盘空间
cleanLocal(OmsFileUtils.genLogDirPath(), localLogRetentionDay); cleanLocal(OmsFileUtils.genLogDirPath(), instanceInfoRetentionDay);
cleanLocal(OmsFileUtils.genContainerJarPath(), localContainerRetentionDay); cleanLocal(OmsFileUtils.genContainerJarPath(), localContainerRetentionDay);
cleanLocal(OmsFileUtils.genTemporaryPath(), TEMPORARY_RETENTION_DAY); cleanLocal(OmsFileUtils.genTemporaryPath(), TEMPORARY_RETENTION_DAY);
// 删除 GridFS 过期文件 // 删除 GridFS 过期文件
cleanRemote(GridFsManager.LOG_BUCKET, remoteLogRetentionDay); cleanRemote(GridFsManager.LOG_BUCKET, instanceInfoRetentionDay);
cleanRemote(GridFsManager.CONTAINER_BUCKET, remoteContainerRetentionDay); cleanRemote(GridFsManager.CONTAINER_BUCKET, remoteContainerRetentionDay);
} }

4
powerjob-server/src/main/resources/application-daily.properties
View File

@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.starttls.required=true
####### 资源清理配置 ####### ####### 资源清理配置 #######
oms.log.retention.local=1 oms.instanceinfo.retention=1
oms.log.retention.remote=1
oms.container.retention.local=1 oms.container.retention.local=1
oms.container.retention.remote=-1 oms.container.retention.remote=-1
oms.instanceinfo.retention=1
####### 缓存配置 ####### ####### 缓存配置 #######
oms.instance.metadata.cache.size=1024 oms.instance.metadata.cache.size=1024

4
powerjob-server/src/main/resources/application-pre.properties
View File

@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.starttls.required=true
####### 资源清理配置 ####### ####### 资源清理配置 #######
oms.log.retention.local=3 oms.instanceinfo.retention=3
oms.log.retention.remote=3
oms.container.retention.local=3 oms.container.retention.local=3
oms.container.retention.remote=-1 oms.container.retention.remote=-1
oms.instanceinfo.retention=3
####### 缓存配置 ####### ####### 缓存配置 #######
oms.instance.metadata.cache.size=1024 oms.instance.metadata.cache.size=1024

4
powerjob-server/src/main/resources/application-product.properties
View File

@ -21,11 +21,9 @@ spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.starttls.required=true spring.mail.properties.mail.smtp.starttls.required=true
####### 资源清理配置 ####### ####### 资源清理配置 #######
oms.log.retention.local=7 oms.instanceinfo.retention=7
oms.log.retention.remote=7
oms.container.retention.local=7 oms.container.retention.local=7
oms.container.retention.remote=-1 oms.container.retention.remote=-1
oms.instanceinfo.retention=3
####### 缓存配置 ####### ####### 缓存配置 #######
oms.instance.metadata.cache.size=2048 oms.instance.metadata.cache.size=2048