diff --git a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java index d99fc97..c065b35 100644 --- a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java @@ -147,16 +147,16 @@ public class OctopusAgentServiceImpl implements OctopusAgentService { ); // 构造结果 - OctopusMessageSynScReplayContend OctopusMessageSynScReplayContend = OctopusMessageSynScReplayContend.build( + OctopusMessageSynScReplayContend octopusMessageSynScReplayContend = OctopusMessageSynScReplayContend.build( ALL_HEALTHY_AGENT_TOPIC_NAME_LIST.size(), CurrentAppOctopusMessageType, currentTime ); - CountDownLatch countDownLatch = OctopusMessageSynScReplayContend.getCountDownLatch(); + CountDownLatch countDownLatch = octopusMessageSynScReplayContend.getCountDownLatch(); // 调用后台接收处理所有的Replay信息 - asyncWaitOctopusMessageResultService.waitFor(OctopusMessageSynScReplayContend); + asyncWaitOctopusMessageResultService.waitFor(octopusMessageSynScReplayContend); /* CompletableFuture getAllAgentCoreInfoFuture = waitCollectAllAgentCoreInfo( result, @@ -176,10 +176,10 @@ public class OctopusAgentServiceImpl implements OctopusAgentService { // 超时,或者 全部信息已经收集 // 此处调用,即可中断 异步任务的收集工作 - asyncWaitOctopusMessageResultService.stopWaiting(OctopusMessageSynScReplayContend); + asyncWaitOctopusMessageResultService.stopWaiting(octopusMessageSynScReplayContend); // 处理结果 - OctopusMessageSynScReplayContend + octopusMessageSynScReplayContend .getReplayOMList() .stream() .forEach( @@ -207,7 +207,7 @@ public class OctopusAgentServiceImpl implements OctopusAgentService { ); // help gc - OctopusMessageSynScReplayContend = null; + octopusMessageSynScReplayContend = null; } return result; diff --git a/server/src/main/java/io/wdd/rpc/controller/StatusController.java b/server/src/main/java/io/wdd/rpc/controller/StatusController.java index aaff09e..335b24b 100644 --- a/server/src/main/java/io/wdd/rpc/controller/StatusController.java +++ b/server/src/main/java/io/wdd/rpc/controller/StatusController.java @@ -79,13 +79,8 @@ public class StatusController { @PostMapping("/agent/status/update") public R>> ManualUpdateAgentStatus() { - // 手动调用更新 - Map agentAliveStatusMap = syncStatusService.SyncCollectAgentAliveStatus( - ALL_AGENT_TOPIC_NAME_LIST, - 5 - ); - - agentAliveStatusMonitorService.updateAllAgentHealthyStatus(agentAliveStatusMap); + // 暴露此部分 Status的核心代码 + agentAliveStatusMonitorService.collectAllAgentAliveStatus(); return R.ok(STATUS_AGENT_LIST_MAP); } diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java b/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java index 8977ac0..d4c1a4e 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java @@ -23,7 +23,7 @@ public class BuildStatusScheduleTask { @Value(value = "${octopus.status.healthy.start-delay}") int healthyCheckStartDelaySeconds; @Value(value = "${octopus.status.metric.cron}") - int metricReportCronExpress; + String metricReportCronExpress; @Value(value = "${octopus.status.metric.start-delay}") int metricReportStartDelaySeconds;