ai-coding/deploy-ease-platform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.42

Browse Source
This commit is contained in:
dengqichen 2025-12-18 10:14:59 +08:00
parent f619654b1a
commit 640cbf9c99
2 changed files with 1002 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/src/main/java/com/qqchen/deploy/backend/deploy/integration/impl/K8sServiceIntegrationImpl.java
View File

@ -21,6 +21,9 @@ import io.kubernetes.client.util.Config;
import io.kubernetes.client.util.Yaml; import io.kubernetes.client.util.Yaml;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import okhttp3.Call;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.StringReader; import java.io.StringReader;
@ -598,8 +601,8 @@ public class K8sServiceIntegrationImpl extends BaseExternalSystemIntegration imp
// 日志大小限制：10MB（防止OOM） // 日志大小限制：10MB（防止OOM）
Integer limitBytes = 10 * 1024 * 1024; Integer limitBytes = 10 * 1024 * 1024;
// 查询Pod日志 // 使用底层Call API + try-with-resources确保Response正确关闭，避免OkHttp连接泄漏
String logs = api.readNamespacedPodLog( Call call = api.readNamespacedPodLogCall(
podName, // Pod名称 podName, // Pod名称
namespace, // 命名空间 namespace, // 命名空间
container, // 容器名称（可选） container, // 容器名称（可选）
@ -610,12 +613,23 @@ public class K8sServiceIntegrationImpl extends BaseExternalSystemIntegration imp
false, // previous（是否查询上一个容器的日志） false, // previous（是否查询上一个容器的日志）
effectiveSinceSeconds, // sinceSeconds（使用智能默认值） effectiveSinceSeconds, // sinceSeconds（使用智能默认值）
effectiveTail, // tail（使用智能默认值） effectiveTail, // tail（使用智能默认值）
true // timestamps（必须启用，用于引用点系统） true, // timestamps（必须启用，用于引用点系统）
null // callback
); );
// 执行调用并使用try-with-resources自动关闭Response
try (Response response = call.execute()) {
ResponseBody body = response.body();
if (body == null) {
log.warn("查询Pod日志返回空body: {}/{}", namespace, podName);
return "";
}
String logs = body.string();
int logLength = logs != null ? logs.length() : 0; int logLength = logs != null ? logs.length() : 0;
log.info("查询Pod日志成功，日志长度: {} bytes, 行数约: {}", logLength, logLength > 0 ? logs.split("\n").length : 0); log.info("查询Pod日志成功，日志长度: {} bytes, 行数约: {}", logLength, logLength > 0 ? logs.split("\n").length : 0);
return logs != null ? logs : ""; return logs != null ? logs : "";
}
} catch (ApiException e) { } catch (ApiException e) {
if (e.getCode() == 404) { if (e.getCode() == 404) {

1005
backend/src/main/resources/db/changelog/sql/20251209141300-01.sql
View File

File diff suppressed because one or more lines are too long