[Minor] Code cleanup

This commit is contained in:
Robert von Burg 2022-11-18 11:52:18 +01:00
parent 905eb9f667
commit 4386e311ca
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 8 additions and 9 deletions

View File

@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.management.*; import java.lang.management.*;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Date;
import java.util.Locale; import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -59,9 +58,10 @@ public class StrolchAgent {
private static final Logger logger = LoggerFactory.getLogger(StrolchAgent.class); private static final Logger logger = LoggerFactory.getLogger(StrolchAgent.class);
private final StrolchVersion appVersion;
private ComponentContainerImpl container; private ComponentContainerImpl container;
private StrolchConfiguration strolchConfiguration; private StrolchConfiguration strolchConfiguration;
private StrolchVersion appVersion;
private ExecutorPool executorPool; private ExecutorPool executorPool;
@ -235,8 +235,8 @@ public class StrolchAgent {
} }
/** /**
* Initializes the underlying container and prepares the executor services. Before calling this method, {@link * Initializes the underlying container and prepares the executor services. Before calling this method,
* #setup(String, File, File, File)} must have ben called * {@link #setup(String, File, File, File)} must have ben called
*/ */
public void initialize() { public void initialize() {
if (this.container == null) if (this.container == null)
@ -404,17 +404,16 @@ public class StrolchAgent {
osJ.addProperty(SYSTEM_LOAD_AVERAGE, osMXBean.getSystemLoadAverage()); osJ.addProperty(SYSTEM_LOAD_AVERAGE, osMXBean.getSystemLoadAverage());
RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean(); RuntimeMXBean runtimeMXBean = ManagementFactory.getRuntimeMXBean();
osJ.addProperty(START_TIME, ISO8601.toString(new Date(runtimeMXBean.getStartTime()))); osJ.addProperty(START_TIME, ISO8601.toString(runtimeMXBean.getStartTime()));
osJ.addProperty(UPTIME, runtimeMXBean.getUptime()); osJ.addProperty(UPTIME, runtimeMXBean.getUptime());
// memory // memory
JsonObject memoryJ = new JsonObject(); JsonObject memoryJ = new JsonObject();
this.systemState.add(MEMORY, memoryJ); this.systemState.add(MEMORY, memoryJ);
if (osMXBean instanceof com.sun.management.OperatingSystemMXBean) { if (osMXBean instanceof com.sun.management.OperatingSystemMXBean os) {
com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean) osMXBean; memoryJ.addProperty(TOTAL_PHYSICAL_MEMORY_SIZE, os.getTotalMemorySize());
memoryJ.addProperty(TOTAL_PHYSICAL_MEMORY_SIZE, os.getTotalPhysicalMemorySize()); memoryJ.addProperty(FREE_PHYSICAL_MEMORY_SIZE, os.getFreeMemorySize());
memoryJ.addProperty(FREE_PHYSICAL_MEMORY_SIZE, os.getFreePhysicalMemorySize());
memoryJ.addProperty(FREE_SWAP_SPACE_SIZE, os.getFreeSwapSpaceSize()); memoryJ.addProperty(FREE_SWAP_SPACE_SIZE, os.getFreeSwapSpaceSize());
memoryJ.addProperty(COMMITTED_VIRTUAL_MEMORY_SIZE, os.getCommittedVirtualMemorySize()); memoryJ.addProperty(COMMITTED_VIRTUAL_MEMORY_SIZE, os.getCommittedVirtualMemorySize());
} }