Merge pull request #174 from CloudExplorer-Dev/pr@main@clear_log

fix: 没有定时删除ES日志
CloudExplorer-Dev · May 22, 2023 · c5247c1 · c5247c1
2 parents cbe6131 + 0dc9644
commit c5247c1
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/framework/management-center/backend/src/main/java/com/fit2cloud/quartz/LogCleanJob.java b/framework/management-center/backend/src/main/java/com/fit2cloud/quartz/LogCleanJob.java
@@ -7,6 +7,7 @@
 import com.fit2cloud.es.entity.SystemLog;
 import com.fit2cloud.service.ILogService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -17,6 +18,7 @@
  * @date 2022/12/11 17:25
  **/
 @Component
+@EnableScheduling
 public class LogCleanJob {
     @Resource
     private IBaseSystemParameterService baseSystemParameterService;
@@ -34,22 +36,26 @@ public void cleanApiLog() {
     }
 
     private void cleanOperatedLog(String m, String logType, String index, Class<?> clazz) {
-        int months = 3;
-        if (StringUtils.isBlank(m)) {
-            LogUtil.info("未设置{}日志保存月数，使用默认值: {}", logType, months);
-        } else {
-            months = Integer.valueOf(m);
-        }
-        if (months < 1) {
-            // if 0
-            months = 3;
-        }
-        if (LogUtil.getLogger().isDebugEnabled()) {
-            LogUtil.getLogger().debug("开始清理{}个月前的{}日志.", months, logType);
-        }
-        logService.deleteEsData(index, months, clazz);
-        if (LogUtil.getLogger().isDebugEnabled()) {
-            LogUtil.getLogger().debug("{}日志清理完成.", logType);
+        try {
+            int months = 3;
+            if (StringUtils.isBlank(m)) {
+                LogUtil.info("未设置{}日志保存月数，使用默认值: {}", logType, months);
+            } else {
+                months = Integer.valueOf(m);
+            }
+            if (months < 1) {
+                // if 0
+                months = 3;
+            }
+            if (LogUtil.getLogger().isDebugEnabled()) {
+                LogUtil.getLogger().debug("开始清理{}个月前的{}日志.", months, logType);
+            }
+            logService.deleteEsData(index, months, clazz);
+            if (LogUtil.getLogger().isDebugEnabled()) {
+                LogUtil.getLogger().debug("{}日志清理完成.", logType);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }