Merge pull request #21469 from taosdata/fix/TD-24369

fix: fix log not compressed when logKeepDays set to positive value

Merge pull request #21469 from taosdata/fix/TD-24369
fix: fix log not compressed when logKeepDays set to positive value
3cf0ebe5 · dapan1121 · GitHub · d4c0ca1a · a57da3bd · 3cf0ebe5
隐藏空白更改
内联并排

Showing with 7 addition and 7 deletion

source/util/src/tlog.c source/util/src/tlog.c +7 -7

未找到文件。
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -210,15 +210,15 @@ static void taosKeepOldLog(char *oldName) {
  (void)taosRenameFile(oldName, fileName);
-  if (tsLogKeepDays < 0) {
+  char compressFileName[LOG_FILE_NAME_LEN + 20];
-    char compressFileName[LOG_FILE_NAME_LEN + 20];
+  snprintf(compressFileName, LOG_FILE_NAME_LEN + 20, "%s.%" PRId64 ".gz", tsLogObj.logName, fileSec);
-    snprintf(compressFileName, LOG_FILE_NAME_LEN + 20, "%s.%" PRId64 ".gz", tsLogObj.logName, fileSec);
+  if (taosCompressFile(fileName, compressFileName) == 0) {
-    if (taosCompressFile(fileName, compressFileName) == 0) {
+    (void)taosRemoveFile(fileName);
-      (void)taosRemoveFile(fileName);
-    }
  }
-  taosRemoveOldFiles(tsLogDir, TABS(tsLogKeepDays));
+  if (tsLogKeepDays > 0) {
+    taosRemoveOldFiles(tsLogDir, tsLogKeepDays);
+  }
 }
 static void *taosThreadToOpenNewFile(void *param) {