zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	agent/src/main/java/io/wdd/agent/executor/status/NetworkStatusExecutor.java
#	agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
#	common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java
This commit is contained in:
IceDerce
2023-01-12 20:58:51 +08:00
parent 5c809bb000 3d4daaabba
commit c875f9d7f7
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
agent/src/main/java/io/wdd/agent/executor/status/AppStatusExecutor.java
View File

@@ -2,6 +2,7 @@ package io.wdd.agent.executor.status;
import io.wdd.agent.config.utils.AgentCommonThreadPool; import io.wdd.agent.config.utils.AgentCommonThreadPool;
import io.wdd.agent.executor.CheckSingleAppStatusCallable;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

1
agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java
View File

@@ -38,7 +38,6 @@ public class AgentStatusCollector {
private static final OperatingSystem os; private static final OperatingSystem os;
private static final List<AgentStatus> AgentStatusCache = Collections.singletonList(new AgentStatus()); private static final List<AgentStatus> AgentStatusCache = Collections.singletonList(new AgentStatus());
private static final long ReportInitDelay = 60000; private static final long ReportInitDelay = 60000;
private static final long ReportFixedRate = 15000; private static final long ReportFixedRate = 15000;
static { static {