bug fix for 'all' source when using es

kube-HPC · Dec 22, 2024 · 12abb9a · 12abb9a
1 parent 4f007be
commit 12abb9a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/api-server/api/task-logs/logs.js b/core/api-server/api/task-logs/logs.js
@@ -137,13 +137,13 @@ class Logs {
                     searchWord,
                     taskTime
                 };
-                if (logMode !== logModes.SIDECAR) {
-                    logs = await logSource.getLogs(args);
-                }
-                else if (sideCars.length > 0 || sideCarNames.length > 0) {
+                if ((sideCars.length > 0 || sideCarNames.length > 0) && (logMode === logModes.SIDECAR || logMode === logModes.ALL)) {
                     const containerNames = sideCarNames.length > 0 ? sideCarNames : sideCars.map(x => x.name);
                     logs = await this._getSideCarLogs(containerNames, logSource, args);
                 }
+                else {
+                    logs = await logSource.getLogs(args);
+                }
                 logs = logs.map(this._format);
                 logs = orderBy(logs, l => l.timestamp, sortOrder.desc);
                 logsData.logs = logs;