[Improve][Zeta] Resolve conflicts

apache · Oct 9, 2024 · 7704b1b · 7704b1b
1 parent 973574c
commit 7704b1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/docs/en/seatunnel-engine/logging.md b/docs/en/seatunnel-engine/logging.md
@@ -89,9 +89,9 @@ SeaTunnel supports scheduled deletion of old log files to prevent disk space exh
 ```yaml
     telemetry:
       logs:
-         scheduled-deletion-enable: true
-         cron: "* * * * *"
-         keep-time: 30000
+         scheduled-deletion-enable: false
+         cron: "0 0 * * *"
+         keep-time: 2592000000 
          prefix: job
          path: /tmp/seatunnel/logs
 ```

diff --git a/docs/zh/seatunnel-engine/logging.md b/docs/zh/seatunnel-engine/logging.md
@@ -89,11 +89,11 @@ SeaTunnel 支持定时删除旧日志文件，以避免磁盘空间不足。您
 ```yaml
     telemetry:
       logs:
-         scheduled-deletion-enable: true
-         cron: "* * * * *"
-         keep-time: 30000
-         prefix: job
-         path: /tmp/seatunnel/logs
+        scheduled-deletion-enable: false
+        cron: "0 0 * * *"
+        keep-time: 2592000000
+        prefix: job
+        path: /tmp/seatunnel/logs
 ```
 
 - `scheduled-deletion-enable`: 是否启用定时删除日志

diff --git a/...tor-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/joblog/JobLogIT.java b/...tor-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/joblog/JobLogIT.java
@@ -104,7 +104,6 @@ public void testJobLogFile() throws Exception {
 
         assertConsoleLog();
         assertFileLog();
-        //
         assertFileLogClean(false);
         Thread.sleep(90000);
         assertFileLogClean(true);

diff --git a/.../main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java b/.../main/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelDomConfigProcessor.java
@@ -328,7 +328,7 @@ private TelemetryConfig parseTelemetryConfig(Node telemetryNode) {
             if (ServerConfigOptions.TELEMETRY_METRIC.key().equals(name)) {
                 telemetryConfig.setMetric(parseTelemetryMetricConfig(node));
             } else if (ServerConfigOptions.TELEMETRY_LOGS.key().equals(name)) {
-                telemetryConfig.setLogs(parseTelemetryLogsConfig(node)); // 解析 logs 部分
+                telemetryConfig.setLogs(parseTelemetryLogsConfig(node));
             } else {
                 LOGGER.warning("Unrecognized element: " + name);
             }