From 9debe1adcdbcf86162ab217d6c62fc3289a243cd Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Sat, 14 Dec 2019 23:52:39 +0200
Subject: [PATCH] Improve resource monitoring

---
 server/apimodels/server.py                |  1 +
 server/bll/statistics/resource_monitor.py | 23 ++++++++++++-----------
 server/database/model/settings.py         |  4 ----
 server/schema/services/server.conf        |  5 +++++
 server/services/server/__init__.py        |  5 +++--
 server/utilities/threads_manager.py       |  6 +++---
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/server/apimodels/server.py b/server/apimodels/server.py
index 53eea57..d977ab6 100644
--- a/server/apimodels/server.py
+++ b/server/apimodels/server.py
@@ -12,3 +12,4 @@ class ReportStatsOptionResponse(Base):
     enabled_time = DateTimeField(nullable=True)
     enabled_version = StringField(nullable=True)
     enabled_user = StringField(nullable=True)
+    current_version = StringField()
diff --git a/server/bll/statistics/resource_monitor.py b/server/bll/statistics/resource_monitor.py
index 509546c..8f1ffd6 100644
--- a/server/bll/statistics/resource_monitor.py
+++ b/server/bll/statistics/resource_monitor.py
@@ -59,6 +59,8 @@ class ResourceMonitor(Thread):
 
     def run(self):
         while True:
+            sleep(self.sample_interval_sec)
+
             sample = self._get_sample()
 
             with self._lock:
@@ -67,21 +69,20 @@ class ResourceMonitor(Thread):
                 self._avg = self._avg.avg(sample, self._count)
                 self._count += 1
 
-            sleep(self.sample_interval_sec)
-
     def get_stats(self) -> dict:
         """ Returns current resource statistics and clears internal resource statistics """
         with self._lock:
             min_ = attr.asdict(self._min)
             max_ = attr.asdict(self._max)
             avg = attr.asdict(self._avg)
-            res = {
-                "interval_sec": (datetime.utcnow() - self._clear_time).total_seconds(),
-                "num_cores": psutil.cpu_count(),
-                **{
-                    k: {"min": v, "max": max_[k], "avg": avg[k]}
-                    for k, v in min_.items()
-                }
-            }
+            interval = datetime.utcnow() - self._clear_time
             self._clear()
-        return res
+
+        return {
+            "interval_sec": interval.total_seconds(),
+            "num_cores": psutil.cpu_count(),
+            **{
+                k: {"min": v, "max": max_[k], "avg": avg[k]}
+                for k, v in min_.items()
+            }
+        }
diff --git a/server/database/model/settings.py b/server/database/model/settings.py
index 76675ae..fd46cb3 100644
--- a/server/database/model/settings.py
+++ b/server/database/model/settings.py
@@ -40,10 +40,6 @@ class Settings(DbModelMixin, Document):
         """ Sets a new value or adds a new key/value setting (if key does not exist) """
         key = key.strip(sep)
         res = Settings.objects(key=key).update(key=key, value=value, upsert=True)
-        # if Settings.objects(key=key).only("key"):
-        #
-        # else:
-        #     res = Settings(key=key, value=value).save()
         return bool(res)
 
     @classmethod
diff --git a/server/schema/services/server.conf b/server/schema/services/server.conf
index fff029c..6de7c22 100644
--- a/server/schema/services/server.conf
+++ b/server/schema/services/server.conf
@@ -86,6 +86,7 @@ endpoints {
     }
 }
 report_stats_option {
+    allow_roles = [ "*" ]
     "2.4" {
         description: "Get or set the report statistics option per-company"
         request {
@@ -117,6 +118,10 @@ report_stats_option {
                     description: "If enabled, returns Id of the user who enabled the option"
                     type: string
                 }
+                current_version {
+                    description: "Returns the current server version"
+                    type: string
+                }
             }
         }
     }
diff --git a/server/services/server/__init__.py b/server/services/server/__init__.py
index 24643bb..ecd111a 100644
--- a/server/services/server/__init__.py
+++ b/server/services/server/__init__.py
@@ -87,7 +87,8 @@ def report_stats(call: APICall, company: str, request: ReportStatsOptionRequest)
                     raise errors.server_error.InternalError(
                         f"Failed setting report_stats to {enabled}"
                     )
-
-        result = ReportStatsOptionResponse(**stats_option.to_mongo())
+        data = stats_option.to_mongo()
+        data["current_version"] = current_version
+        result = ReportStatsOptionResponse(**data)
 
     call.result.data_model = result
diff --git a/server/utilities/threads_manager.py b/server/utilities/threads_manager.py
index 79f16ad..2f229a1 100644
--- a/server/utilities/threads_manager.py
+++ b/server/utilities/threads_manager.py
@@ -12,7 +12,7 @@ class ThreadsManager:
         self.objects = {}
         self.lock = Lock()
 
-        for name, thread in threads.items():
+        for thread_name, thread in threads.items():
             if issubclass(thread, Thread):
                 thread = thread()
                 thread.start()
@@ -20,9 +20,9 @@ class ThreadsManager:
                 if not thread.is_alive():
                     thread.start()
             else:
-                raise Exception(f"Expected thread or thread class ({name}): {thread}")
+                raise Exception(f"Expected thread or thread class ({thread_name}): {thread}")
 
-            self.objects[name] = thread
+            self.objects[thread_name] = thread
 
     def register(self, thread_name, daemon=True):
         def decorator(f):