From 28b11cfe0fa5694a3813384c45d7eef11ef8c48e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Thu, 21 Feb 2019 11:26:18 +0800 Subject: [PATCH] Update system_api.py --- class/core/system_api.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/class/core/system_api.py b/class/core/system_api.py index 8b5532a97..8e656b468 100755 --- a/class/core/system_api.py +++ b/class/core/system_api.py @@ -179,7 +179,7 @@ class system_api: data['version'] = '0.0.1' return data - def getLoadAverage(self, get=None): + def getLoadAverage(self): c = os.getloadavg() data = {} data['one'] = float(c[0]) @@ -251,7 +251,7 @@ class system_api: used = psutil.cpu_percent(interval=interval) return used, cpuCount - def getMemInfo(self, get=None): + def getMemInfo(self): # 取内存信息 mem = psutil.virtual_memory() if public.getOs() == 'darwin': @@ -413,7 +413,7 @@ class system_api: os.system('echo > /tmp/panelBoot.pl') return total, count - def getNetWork(self, get=None): + def getNetWork(self): # return self.GetNetWorkApi(get); # 取网络流量信息 try: @@ -441,8 +441,8 @@ class system_api: session['otime'] = time.time() networkInfo['cpu'] = self.getCpuInfo() - networkInfo['load'] = self.getLoadAverage(get) - networkInfo['mem'] = self.getMemInfo(get) + networkInfo['load'] = self.getLoadAverage() + networkInfo['mem'] = self.getMemInfo() return networkInfo except Exception, e: