mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志修改

Browse Source
This commit is contained in:
even 2025-05-26 19:35:25 +08:00
parent 8ab2eb2d4c
commit 54377af6df
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java
View File

@ -23,5 +23,5 @@ public interface TaskService extends IService<PipTask> {
void copyTask(String taskId); void copyTask(String taskId);
Boolean updateTask(@RequestBody TaskUpdateReq req); Boolean updateTask(@RequestBody TaskUpdateReq req);
CommonResult<PipTaskLog> getLogContentByTaskId(@PathVariable String taskId); CommonResult<String> getLogContentByTaskId(@PathVariable String taskId);
} }

15
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java
View File

@ -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.req.task.TaskUpdateReq;
import cd.casic.ci.common.pipeline.resp.task.TasksResp; import cd.casic.ci.common.pipeline.resp.task.TasksResp;
import cd.casic.ci.process.engine.constant.EngineRuntimeConstant; 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.manager.RunContextManager;
import cd.casic.ci.process.engine.runContext.BaseRunContext; import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; import cd.casic.ci.process.process.dal.pipeline.PipTaskDao;
@ -34,6 +35,8 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
private PipTaskDao taskDao; private PipTaskDao taskDao;
@Resource @Resource
private RunContextManager contextManager; private RunContextManager contextManager;
@Resource
private LoggerManager loggerManager;
@Override @Override
@ -120,14 +123,8 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
} }
@Override @Override
public CommonResult<PipTaskLog> getLogContentByTaskId(String taskId) { public CommonResult<String> getLogContentByTaskId(String taskId) {
BaseRunContext context = contextManager.getContext(taskId);
if (context==null) { return CommonResult.success(loggerManager.getLogContent(taskId));
return CommonResult.success(new PipTaskLog());
}
if (context.getLocalVariables().get(EngineRuntimeConstant.LOG_KEY) instanceof PipTaskLog log) {
return CommonResult.success(log);
}
return CommonResult.success(new PipTaskLog());
} }
} }

2
ops-server/src/main/java/cd/casic/server/controller/TasksController.java
View File

@ -47,7 +47,7 @@ public class TasksController {
return CommonResult.success(b); return CommonResult.success(b);
} }
@PostMapping("/getLogContentByTaskId/{taskId}") @PostMapping("/getLogContentByTaskId/{taskId}")
public CommonResult<PipTaskLog> getLogContentByTaskId(@PathVariable String taskId){ public CommonResult<String> getLogContentByTaskId(@PathVariable String taskId){
return taskService.getLogContentByTaskId(taskId); return taskService.getLogContentByTaskId(taskId);
} }