From f315fe0e605b76c8d691f0cd30d9852bc631ac97 Mon Sep 17 00:00:00 2001 From: "Steve L. Nyemba" Date: Fri, 10 Mar 2017 00:49:50 -0600 Subject: [PATCH] Bug fix with display & format function --- src/monitor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monitor.py b/src/monitor.py index 00889fa..70c4ef3 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -30,7 +30,7 @@ class Analysis: return {"month":d.month,"year":d.year, "day":d.day,"hour":d.hour,"minute":d.minute} def getName(self): return self.__class__.__name__ - def format(self,text): + def cleanup(self,text): return re.sub('([0-9]+[a-zA-Z]*)|[^a-zA-Z\s:]',' ',str(text)).strip() @@ -217,7 +217,7 @@ class DetailProcess(Analysis): else: return "crash" def format(self,row): - r= {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"proc_count":row[3],"label":self.format(row[4])} + r= {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"proc_count":row[3],"label":self.cleanup(row[4])} status = self.status(r) r['status'] = status return r