(seatunnel) branch dev updated: [Fix][Zeta] Handle null log file name response (#9977)

[corgy]

This is an automated email from the ASF dual-hosted git repository.

corgy pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new fe19a7ed14 [Fix][Zeta] Handle null log file name response (#9977)
fe19a7ed14 is described below

commit fe19a7ed1456dd91114568b20b3ac1bf632a8b6b
Author: dy102 <132787602+dyb...@users.noreply.github.com>
AuthorDate: Fri Oct 31 19:11:48 2025 +0900

    [Fix][Zeta] Handle null log file name response (#9977)
---
 .../engine/server/rest/RestHttpGetCommandProcessor.java     |  2 +-
 .../seatunnel/engine/server/rest/service/LogService.java    | 13 ++++++++++---
 .../engine/server/rest/servlet/CurrentNodeLogServlet.java   |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/RestHttpGetCommandProcessor.java
 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/RestHttpGetCommandProcessor.java
index 07a26f2252..2b5426821b 100644
--- 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/RestHttpGetCommandProcessor.java
+++ 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/RestHttpGetCommandProcessor.java
@@ -313,7 +313,7 @@ public class RestHttpGetCommandProcessor extends 
HttpCommandProcessor<HttpGetCom
 
         if (StringUtils.isBlank(logName)) {
             // Get Current Node Log List
-            this.prepareResponse(httpGetCommand, 
getRestValue(logService.currentNodeLog(uri)));
+            this.prepareResponse(httpGetCommand, 
getRestValue(logService.currentNodeLog()));
         } else {
             // Get Current Node Log Content
             prepareLogResponse(httpGetCommand, logPath, logName);
diff --git 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/service/LogService.java
 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/service/LogService.java
index 304265f2fe..d112ae069b 100644
--- 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/service/LogService.java
+++ 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/service/LogService.java
@@ -49,7 +49,7 @@ public class LogService extends BaseLogService {
         String logPath = getLogPath();
         List<File> logFileList = FileUtils.listFile(logPath);
         if (logFileList == null) {
-            return null;
+            return new ArrayList<>();
         }
         return 
logFileList.stream().map(File::getName).collect(Collectors.toList());
     }
@@ -71,7 +71,14 @@ public class LogService extends BaseLogService {
                     String host = 
systemMonitoringInformation.asObject().get("host").asString();
                     String url = "http://"; + host + ":" + port + contextPath;
                     String allName = sendGet(url + REST_URL_GET_ALL_LOG_NAME);
-                    log.debug(String.format("Request: %s , Result: %s", url, 
allName));
+                    if (StringUtils.isBlank(allName)) {
+                        log.warn(
+                                "Get log file name failed: response logName is 
blank. url: {}, response: {}",
+                                url + REST_URL_GET_ALL_LOG_NAME,
+                                allName);
+                        return;
+                    }
+                    log.debug("Request: {} , Result: {}", url, allName);
                     ArrayNode jsonNodes = JsonUtils.parseArray(allName);
 
                     jsonNodes.forEach(
@@ -113,7 +120,7 @@ public class LogService extends BaseLogService {
         return buildWebSiteContent(logLink);
     }
 
-    public String currentNodeLog(String uri) {
+    public String currentNodeLog() {
         List<File> logFileList = FileUtils.listFile(getLogPath());
         StringBuffer logLink = new StringBuffer();
         if (logFileList != null) {
diff --git 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/servlet/CurrentNodeLogServlet.java
 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/servlet/CurrentNodeLogServlet.java
index f8fd1e2037..53526f1c22 100644
--- 
a/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/servlet/CurrentNodeLogServlet.java
+++ 
b/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/rest/servlet/CurrentNodeLogServlet.java
@@ -55,7 +55,7 @@ public class CurrentNodeLogServlet extends LogBaseServlet {
         String logPath = logService.getLogPath();
 
         if (StringUtils.isBlank(logName)) {
-            writeHtml(resp, logService.currentNodeLog(uri));
+            writeHtml(resp, logService.currentNodeLog());
         } else {
             // Get Current Node Log Content
             prepareLogResponse(resp, logPath, logName);