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:55:33 +08:00
parent 54377af6df
commit e16d90d3c4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java
View File

@ -25,11 +25,11 @@ public class MemoryLogManager implements LoggerManager {
/** /**
* 第一级 是taskId，可能同一个账号、IP、建立多个连接所以保存为list * 第一级 是taskId，可能同一个账号、IP、建立多个连接所以保存为list
* */ * */
private final static Map<String, List<SseEmitter>> taskIdSSEMap = new ConcurrentHashMap<>(); private final Map<String, List<SseEmitter>> taskIdSSEMap = new ConcurrentHashMap<>();
private final static Map<String,StringBuffer> taskIdMemoryLogMap = new ConcurrentHashMap<>(); private final Map<String,StringBuffer> taskIdMemoryLogMap = new ConcurrentHashMap<>();
public static final Integer FLUSH_DB_SIZE=2*1024*1024; public final Integer FLUSH_DB_SIZE=2*1024*1024;
/** /**
* 缓存最近一次执行的日志，key是taskId，val是数据库id（已入库的情况下）用于buffer满了增加日志内容 * 缓存最近一次执行的日志，key是taskId，val是数据库id（已入库的情况下）用于buffer满了增加日志内容
* 读取日志的时候同时读取数据库和内存中的日志 * 读取日志的时候同时读取数据库和内存中的日志
@ -59,7 +59,7 @@ public class MemoryLogManager implements LoggerManager {
* 内存满4mb入库，查询日志和入库操作用同一把锁 * 内存满4mb入库，查询日志和入库操作用同一把锁
* 然后新内容推sse * 然后新内容推sse
* */ * */
StringBuffer logCache = taskIdMemoryLogMap.getOrDefault(taskId, new StringBuffer()); StringBuffer logCache = taskIdMemoryLogMap.computeIfAbsent(taskId, k -> new StringBuffer());
int length = logCache.length(); int length = logCache.length();
if (length>=FLUSH_DB_SIZE) { if (length>=FLUSH_DB_SIZE) {
synchronized (this){ synchronized (this){

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

@ -124,7 +124,6 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
@Override @Override
public CommonResult<String> getLogContentByTaskId(String taskId) { public CommonResult<String> getLogContentByTaskId(String taskId) {
return CommonResult.success(loggerManager.getLogContent(taskId)); return CommonResult.success(loggerManager.getLogContent(taskId));
} }
} }