diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java index 3547fe11..ede76079 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java @@ -147,8 +147,8 @@ public class ExperimentInsController extends BaseController { @GetMapping("/pods/realTimeLog") @ApiOperation("获取pod实时日志请求") public GenericsAjaxResult getRealtimePodLogFromPod(@PathVariable("pod_name") String podName, - @PathVariable("namespace") String namespace){ - return genericsSuccess(this.experimentInsService.getRealtimePodLogFromPod(podName,namespace)); + @PathVariable("namespace") String namespace,@PathVariable("container_name") String containerName){ + return genericsSuccess(this.experimentInsService.getRealtimePodLogFromPod(podName,namespace,containerName)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java index 13ff922d..8293dec1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java @@ -95,5 +95,5 @@ public interface ExperimentInsService { Map getRealtimePodLog(String podName, String startTime); - String getRealtimePodLogFromPod(String podName, String namespace); + String getRealtimePodLogFromPod(String podName, String namespace,String container); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index ee45a36e..19f4ddf5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -522,8 +522,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } @Override - public String getRealtimePodLogFromPod(String podName, String namespace) { - return K8sClientUtil.getPodLogs(podName, namespace, logsLines); + public String getRealtimePodLogFromPod(String podName, String namespace,String container) { + return K8sClientUtil.getPodLogs(podName, namespace,container, logsLines); } private boolean isTerminatedState(ExperimentIns ins) throws IOException { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java index c0b59127..04a2d4bd 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java @@ -404,10 +404,10 @@ public class K8sClientUtil { return pod.getStatus().getPhase(); } - public static String getPodLogs(String podName,String namespace,int line) { + public static String getPodLogs(String podName,String namespace,String container,int line) { CoreV1Api api = new CoreV1Api(apiClient); try { - String log = api.readNamespacedPodLog(podName, namespace, null, null, null, null, null,null, null, line, null); + String log = api.readNamespacedPodLog(podName, namespace, StringUtils.isEmpty(container)?null:container, null, null, null, null,null, null, line, null); return log; } catch (ApiException e) { throw new RuntimeException("获取Pod日志异常", e);