From e16d90d3c4a36cf5e4cefa32d4c49f31ce9660f2 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Mon, 26 May 2025 19:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/process/engine/manager/impl/MemoryLogManager.java | 8 ++++---- .../process/service/task/impl/TaskServiceImpl.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java index 48b671fa..73740453 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java @@ -25,11 +25,11 @@ public class MemoryLogManager implements LoggerManager { /** * 第一级 是taskId，可能同一个账号、IP、建立多个连接所以保存为list * */ - private final static Map> taskIdSSEMap = new ConcurrentHashMap<>(); + private final Map> taskIdSSEMap = new ConcurrentHashMap<>(); - private final static Map taskIdMemoryLogMap = new ConcurrentHashMap<>(); + private final Map 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满了增加日志内容 * 读取日志的时候同时读取数据库和内存中的日志 @@ -59,7 +59,7 @@ public class MemoryLogManager implements LoggerManager { * 内存满4mb入库，查询日志和入库操作用同一把锁 * 然后新内容推sse * */ - StringBuffer logCache = taskIdMemoryLogMap.getOrDefault(taskId, new StringBuffer()); + StringBuffer logCache = taskIdMemoryLogMap.computeIfAbsent(taskId, k -> new StringBuffer()); int length = logCache.length(); if (length>=FLUSH_DB_SIZE) { synchronized (this){ 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 c7d320a1..7bc0597a 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 @@ -124,7 +124,6 @@ public class TaskServiceImpl extends ServiceImpl implements @Override public CommonResult getLogContentByTaskId(String taskId) { - return CommonResult.success(loggerManager.getLogContent(taskId)); } }