From 6761ae3445a49323c74566e6dd617b90a8ef8c14 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Thu, 6 Aug 2020 13:37:27 +0930
Subject: [PATCH] Catch exception when psutil returns OSError

---
 gns3server/notification_queue.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gns3server/notification_queue.py b/gns3server/notification_queue.py
index d81a2a2b..4d4492ef 100644
--- a/gns3server/notification_queue.py
+++ b/gns3server/notification_queue.py
@@ -21,6 +21,9 @@ import psutil
 
 from gns3server.utils.cpu_percent import CpuPercent
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class NotificationQueue(asyncio.Queue):
     """
@@ -51,10 +54,14 @@ class NotificationQueue(asyncio.Queue):
         """
         Return the content of the ping notification
         """
-        msg = {}
+        msg = {"cpu_usage_percent": 0,
+               "memory_usage_percent": 0}
         # Non blocking call in order to get cpu usage. First call will return 0
-        msg["cpu_usage_percent"] = CpuPercent.get(interval=None)
-        msg["memory_usage_percent"] = psutil.virtual_memory().percent
+        try:
+            msg["cpu_usage_percent"] = CpuPercent.get(interval=None)
+            msg["memory_usage_percent"] = psutil.virtual_memory().percent
+        except OSError as e:
+            log.warning("Could not get CPU and memory usage from psutil: {}".format(e))
         return msg
 
     async def get_json(self, timeout):