diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java index 63cf96a2..309e2c9a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java @@ -23,5 +23,5 @@ public interface TaskService extends IService { void copyTask(String taskId); Boolean updateTask(@RequestBody TaskUpdateReq req); - CommonResult getLogContentByTaskId(@PathVariable String taskId); + CommonResult getLogContentByTaskId(@PathVariable String taskId); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index f287be7c..c7d320a1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java @@ -3,6 +3,7 @@ package cd.casic.ci.process.process.service.task.impl; import cd.casic.ci.common.pipeline.req.task.TaskUpdateReq; import cd.casic.ci.common.pipeline.resp.task.TasksResp; import cd.casic.ci.process.engine.constant.EngineRuntimeConstant; +import cd.casic.ci.process.engine.manager.LoggerManager; import cd.casic.ci.process.engine.manager.RunContextManager; import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; @@ -34,6 +35,8 @@ public class TaskServiceImpl extends ServiceImpl implements private PipTaskDao taskDao; @Resource private RunContextManager contextManager; + @Resource + private LoggerManager loggerManager; @Override @@ -120,14 +123,8 @@ public class TaskServiceImpl extends ServiceImpl implements } @Override - public CommonResult getLogContentByTaskId(String taskId) { - BaseRunContext context = contextManager.getContext(taskId); - if (context==null) { - return CommonResult.success(new PipTaskLog()); - } - if (context.getLocalVariables().get(EngineRuntimeConstant.LOG_KEY) instanceof PipTaskLog log) { - return CommonResult.success(log); - } - return CommonResult.success(new PipTaskLog()); + public CommonResult getLogContentByTaskId(String taskId) { + + return CommonResult.success(loggerManager.getLogContent(taskId)); } } diff --git a/ops-server/src/main/java/cd/casic/server/controller/TasksController.java b/ops-server/src/main/java/cd/casic/server/controller/TasksController.java index 9dd00ce4..03d0f627 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/TasksController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/TasksController.java @@ -47,7 +47,7 @@ public class TasksController { return CommonResult.success(b); } @PostMapping("/getLogContentByTaskId/{taskId}") - public CommonResult getLogContentByTaskId(@PathVariable String taskId){ + public CommonResult getLogContentByTaskId(@PathVariable String taskId){ return taskService.getLogContentByTaskId(taskId); }