浏览代码

Bug fix with display & format function

Steve L. Nyemba 8 年之前
父节点
当前提交
f315fe0e60
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      src/monitor.py

+ 2 - 2
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