sciveo 0.0.30__tar.gz → 0.0.31__tar.gz

{sciveo-0.0.30 → sciveo-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.30
+Version: 0.0.31
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

{sciveo-0.0.30 → sciveo-0.0.31}/sciveo/__init__.py

@@ -14,11 +14,13 @@ from builtins import ImportError
 try:
 
   import os
+  import time
 
   from sciveo.common.tools.logger import *
   from sciveo.common.tools.daemon import TasksDaemon, __upload_content__
   from sciveo.content.runner import ProjectRunner
   from sciveo.content.dataset import Dataset
+  from sciveo.monitoring.monitor import BaseMonitor
   from sciveo.version import __version__
 
 
@@ -41,5 +43,12 @@ try:
   def dataset(info={}):
     return Dataset.get(info)
 
+  # Monitoring start
+  def monitor(period=120):
+    mon = BaseMonitor(period=period)
+    mon.start()
+    while(True):
+      time.sleep(60)
+
 except ImportError as e:
   pass

{sciveo-0.0.30 → sciveo-0.0.31}/sciveo/monitoring/monitor.py

@@ -32,14 +32,17 @@ class BaseMonitor(DaemonBase):
     self.data["RAM"] = {
       "installed": self.data["RAM"]
     }
-    psutil.cpu_percent(interval=0.5)
-    self.getserial()
+
+    self.initial_cpu_usage = psutil.cpu_percent(interval=5, percpu=True)
+    cpuserial = self.getserial()
 
     self.data["logs"] = {}
     self.list_logs = []
 
     self.api = APIRemoteClient()
 
+    debug(type(self).__name__, "init", cpuserial, "initial_cpu_usage", self.initial_cpu_usage)
+
   def __call__(self):
     return self.data
 
@@ -59,7 +62,11 @@ class BaseMonitor(DaemonBase):
       self.data["logs"][log_name] = self.tail_file(log_path)[-3:]
 
   def get_cpu_usage(self):
-    self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
+    if self.initial_cpu_usage is None:
+      self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
+    else:
+      self.data["CPU"]["usage_per_core"] = self.initial_cpu_usage
+      self.initial_cpu_usage = None
     # self.data["CPU"]["usage_per_core"] = (np.array(self.data["CPU"]["usage_per_core"]) / 100.0).tolist()
     self.data["CPU"]["usage"] = np.array(self.data["CPU"]["usage_per_core"]).mean()
 
@@ -101,7 +108,7 @@ class BaseMonitor(DaemonBase):
 
 
 if __name__ == "__main__":
-  mon = BaseMonitor(period=10)
+  mon = BaseMonitor(period=60)
   mon.start()
 
   while(True):

sciveo-0.0.31/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.0.31'

{sciveo-0.0.30 → sciveo-0.0.31}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.30
+Version: 0.0.31
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

sciveo-0.0.30/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.0.30'