commit 10/31/2015

system.py

@@ -17,7 +17,7 @@ class System_Debug():
     import os
 
     # Return CPU temperature as a character string
-    def getCPUtemperature():
+    def getCPUtemperature(self):
         res = os.popen('vcgencmd measure_temp').readline()
         return(res.replace("temp=","").replace("'C\n",""))
 
@@ -25,22 +25,20 @@ class System_Debug():
         p=psutil.cpu_percent(interval=1)
         return p
 
-    def getRAMinfo():
-        p = psutil.virtual_memory()
-        p = psutil.swap_memory()
+    def getRAMinfo(self):
+        p = dict(psutil.virtual_memory()._asdict())
+        p = dict(psutil.swap_memory()._asdict())
         return p
 
-    def getDiskSpace():
-        p = psutil.disk_usage('/')
+    def getDiskSpace(self):
+        p = dict(psutil.disk_usage('/')._asdict())
         return p
 
     @property
     def stats (self):
-        #courtesy of Phillipe
-        # https://www.raspberrypi.org/forums/memberlist.php?mode=viewprofile&u=40834&sid=dd38cc12161ac10b324ed2a2238972d3
          # CPU informatiom
         CPU_temp = self.getCPUtemperature()
-        CPU_usage = self.getCPUuse()
+        CPU_usage = self.getCPUusage()
 
         # RAM information
         # Output is in kb, here I convert it in Mb for readability
@@ -50,7 +48,13 @@ class System_Debug():
         # Disk information
         DISK_stats = self.getDiskSpace()
 
+        pid = os.getpid()
+
+
+        # print(type(DISK_stats._asdict()))
+
         return {"cpu_temp":CPU_temp,
                 "cpu_usage":CPU_usage,
                 "ram_stats":RAM_stats,
-                "disk_stats":DISK_stats}
+                "disk_stats":DISK_stats,
+                "PID":pid}