diff --git a/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java b/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java index 1bd0ac7..1c1b743 100644 --- a/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java +++ b/agent/src/main/java/io/wdd/agent/status/AgentStatusCollector.java @@ -90,12 +90,12 @@ public class AgentStatusCollector { * the server info are not collected completely * this will be executed to update or complete the octopus agent server info */ - @Scheduled(initialDelay = 180000) - public void updateAgentServerInfo(){ - - - - } +// @Scheduled(initialDelay = 180000) +// public void updateAgentServerInfo(){ +// +// +// +// } // agent boot up 120s then start to report its status // at the fix rate of 15s diff --git a/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java b/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java index 4eaccb6..d9056e9 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java +++ b/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java @@ -10,7 +10,6 @@ import oshi.software.os.OperatingSystem; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.concurrent.TimeUnit; @Data @AllArgsConstructor @@ -36,7 +35,7 @@ public class AgentSystemInfo { .manufacturer(os.getManufacturer()) .bootTime(TimeUtils.localDateTimeString( LocalDateTime.ofInstant( - Instant.ofEpochMilli(os.getSystemBootTime()), + Instant.ofEpochSecond(os.getSystemBootTime()), ZoneId.of("UTC+8") ) )) diff --git a/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java b/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java index c2e4d55..9a830b8 100644 --- a/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java +++ b/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java @@ -53,7 +53,7 @@ public class CpuInfo { /** * CPU型号信息 */ - private String cpuModel; + private CentralProcessor.ProcessorIdentifier cpuModel; private double[] cpuLoadAverage; @@ -62,7 +62,7 @@ public class CpuInfo { /** * CPU型号信息 */ - private CpuTicks ticks; + //private CpuTicks ticks; public CpuInfo(CentralProcessor processor, long waitingTime){ @@ -80,12 +80,12 @@ public class CpuInfo { private void init(CentralProcessor processor, long waitingTime) { final CpuTicks ticks = new CpuTicks(processor, waitingTime); - this.ticks = ticks; + //this.ticks = ticks; this.cpuTotal = processor.getLogicalProcessorCount(); this.coreTotal = processor.getPhysicalProcessorCount(); - this.cpuModel = processor.toString(); + this.cpuModel = processor.getProcessorIdentifier(); final long totalCpu = ticks.totalCpu(); this.cpuUsageTotol = totalCpu; @@ -101,7 +101,7 @@ public class CpuInfo { this.systemLoadAverage = processor.getSystemLoadAverage(3); // cpu load average - this.cpuLoadAverage = processor.getProcessorCpuLoad(waitingTime); + this.cpuLoadAverage = formatCpuLoadAverage(processor.getProcessorCpuLoad(waitingTime)); } @@ -120,4 +120,19 @@ public class CpuInfo { return Double.parseDouble(LOAD_FORMAT.format(tick <= 0 ? 0 : (100d * tick / totalCpu))); } + private static double formatDouble(double doubleNum) { + + return Double.parseDouble(LOAD_FORMAT.format(doubleNum)); + } + + private static double[] formatCpuLoadAverage(double[] cpuLoadAverage){ + double[] result = new double[cpuLoadAverage.length]; + + for (int i = 0; i < cpuLoadAverage.length; i++) { + result[i] = formatDouble(cpuLoadAverage[i]); + } + + return result; + } + } diff --git a/common/src/main/java/io/wdd/common/utils/TimeUtils.java b/common/src/main/java/io/wdd/common/utils/TimeUtils.java index dd3b037..1715d20 100644 --- a/common/src/main/java/io/wdd/common/utils/TimeUtils.java +++ b/common/src/main/java/io/wdd/common/utils/TimeUtils.java @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Date; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -43,7 +42,7 @@ public class TimeUtils { * * */ - private static final Map times = new HashMap<>(16); + private static final Map times = new LinkedHashMap<>(); static { times.put("year", TimeUnit.DAYS.toMillis(365));