From c9fb23e1054271fc7efe424d77f1ed7fdaaf7891 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 10 May 2023 17:53:50 +0200
Subject: [PATCH] SystemUtil improvements

---
 .../java/org/thingsboard/common/util/SystemUtil.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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