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 20:35:38 +08:00
parent 02447a79a4
commit a986288195
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/** /**
* 流水线运行时日志管理 * 流水线运行时日志管理
* */ * */
@ -31,6 +35,7 @@ public class MemoryLogManager implements LoggerManager {
private final Map<String,StringBuffer> taskIdMemoryLogMap = new ConcurrentHashMap<>(); private final Map<String,StringBuffer> taskIdMemoryLogMap = new ConcurrentHashMap<>();
public final Integer FLUSH_DB_SIZE=2*1024*1024; public final Integer FLUSH_DB_SIZE=2*1024*1024;
private ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
/** /**
* 缓存最近一次执行的日志，key是taskId，val是数据库id（已入库的情况下）用于buffer满了增加日志内容 * 缓存最近一次执行的日志，key是taskId，val是数据库id（已入库的情况下）用于buffer满了增加日志内容
* 读取日志的时候同时读取数据库和内存中的日志 * 读取日志的时候同时读取数据库和内存中的日志
@ -41,7 +46,7 @@ public class MemoryLogManager implements LoggerManager {
@Override @Override
public SseEmitter subscribe(String taskId,HttpServletRequest request) { public SseEmitter subscribe(String taskId,HttpServletRequest request) {
String ipAddr = IpUtil.getIpAddr(request); String ipAddr = IpUtil.getIpAddr(request);
SseEmitter emitter = new SseEmitter(3000L); SseEmitter emitter = new SseEmitter(30000L);
emitterInit(emitter,taskId); emitterInit(emitter,taskId);
Long loginUserId = WebFrameworkUtils.getLoginUserId(); Long loginUserId = WebFrameworkUtils.getLoginUserId();
log.info("SSE连接建立"); log.info("SSE连接建立");
@ -114,6 +119,13 @@ public class MemoryLogManager implements LoggerManager {
} }
private void emitterInit(SseEmitter emitter,String taskId){ private void emitterInit(SseEmitter emitter,String taskId){
scheduler.scheduleWithFixedDelay(()-> {
try {
emitter.send("\n\n");
} catch (IOException e) {
log.error("",e);
}
},0,30,TimeUnit.SECONDS);
emitter.onCompletion(()->{ emitter.onCompletion(()->{
taskIdSSEMap.remove(taskId); taskIdSSEMap.remove(taskId);
log.info("===================taskId:{}断开连接===============",taskId); log.info("===================taskId:{}断开连接===============",taskId);