dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SystemUtil improvements

Browse Source
This commit is contained in:
YevhenBondarenko 2023-05-10 17:53:50 +02:00
parent bcd2b94156
commit c9fb23e105
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java
View File

@ -42,7 +42,7 @@ public class SystemUtil {
long total = memory.getTotal(); long total = memory.getTotal();
long available = memory.getAvailable(); long available = memory.getAvailable();
return Optional.of(toPercent(total - available, total)); return Optional.of(toPercent(total - available, total));
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get memory usage!!!", e); log.debug("Failed to get memory usage!!!", e);
} }
return Optional.empty(); return Optional.empty();
@ -51,7 +51,7 @@ public class SystemUtil {
public static Optional<Long> getTotalMemory() { public static Optional<Long> getTotalMemory() {
try { try {
return Optional.of(HARDWARE.getMemory().getTotal()); return Optional.of(HARDWARE.getMemory().getTotal());
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get total memory!!!", e); log.debug("Failed to get total memory!!!", e);
} }
return Optional.empty(); return Optional.empty();
@ -60,7 +60,7 @@ public class SystemUtil {
public static Optional<Integer> getCpuUsage() { public static Optional<Integer> getCpuUsage() {
try { try {
return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad(1000) * 100.0)); return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad(1000) * 100.0));
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get cpu usage!!!", e); log.debug("Failed to get cpu usage!!!", e);
} }
return Optional.empty(); return Optional.empty();
@ -69,7 +69,7 @@ public class SystemUtil {
public static Optional<Integer> getCpuCount() { public static Optional<Integer> getCpuCount() {
try { try {
return Optional.of(HARDWARE.getProcessor().getLogicalProcessorCount()); return Optional.of(HARDWARE.getProcessor().getLogicalProcessorCount());
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get total cpu count!!!", e); log.debug("Failed to get total cpu count!!!", e);
} }
return Optional.empty(); return Optional.empty();
@ -81,7 +81,7 @@ public class SystemUtil {
long total = store.getTotalSpace(); long total = store.getTotalSpace();
long available = store.getUsableSpace(); long available = store.getUsableSpace();
return Optional.of(toPercent(total - available, total)); return Optional.of(toPercent(total - available, total));
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get free disc space!!!", e); log.debug("Failed to get free disc space!!!", e);
} }
return Optional.empty(); return Optional.empty();
@ -91,7 +91,7 @@ public class SystemUtil {
try { try {
FileStore store = Files.getFileStore(Paths.get("/")); FileStore store = Files.getFileStore(Paths.get("/"));
return Optional.of(store.getTotalSpace()); return Optional.of(store.getTotalSpace());
} catch (Exception e) { } catch (Throwable e) {
log.debug("Failed to get total disc space!!!", e); log.debug("Failed to get total disc space!!!", e);
} }
return Optional.empty(); return Optional.empty();