sciveo 0.0.45__tar.gz → 0.0.46__tar.gz

{sciveo-0.0.45 → sciveo-0.0.46}/PKG-INFO

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

{sciveo-0.0.45 → sciveo-0.0.46}/sciveo/common/tools/hardware.py

@@ -32,19 +32,25 @@ def new_guid(num_characters=32):
 
 class HardwareInfo:
   def __init__(self):
-    self.data = {
-      "CPU": {"count": os.cpu_count()},
-      "RAM": format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
-    }
+    self.data = {}
 
     self.get_cpu()
+    self.get_ram()
 
   def __call__(self):
     return self.data
 
+  def get_ram(self):
+    try:
+      self.data["RAM"] = format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
+    except Exception:
+      pass
+
   def get_cpu(self):
     list_keys = ["model name", "stepping", "cpu MHz", "cache size", "siblings", "cpu cores", "bogomips"]
     try:
+      self.data["CPU"] = {"count": os.cpu_count()}
+
       cpu_info = {}
       with open('/proc/cpuinfo', 'r') as file:
         lines = file.readlines()

{sciveo-0.0.45 → sciveo-0.0.46}/sciveo/monitoring/monitor.py

@@ -31,9 +31,7 @@ class BaseMonitor(DaemonBase):
 
     self.data = HardwareInfo()()
     self.data.setdefault("CPU", {})
-    self.data["RAM"] = {
-      "installed": self.data["RAM"]
-    }
+    self.data["RAM"] = {}
     self.data["LOG"] = {}
     self.list_logs = []
 
@@ -77,6 +75,7 @@ class BaseMonitor(DaemonBase):
     self.data["RAM"]["used"] = memory.used
     self.data["RAM"]["total"] = memory.total
     self.data["RAM"]["free"] = memory.free
+    self.data["RAM"]["installed"] = format_memory_size(memory.total)
     self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
 
   def getserial(self):

sciveo-0.0.46/sciveo/version.py

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

{sciveo-0.0.45 → sciveo-0.0.46}/sciveo.egg-info/PKG-INFO

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

sciveo-0.0.45/sciveo/version.py

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