joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu usage fix

Browse Source
This commit is contained in:
Jakob Ketterl 2019-05-15 19:43:52 +02:00
parent 117d0483f7
commit cffb65e37d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/openwebrx.js
View File

@ -1221,7 +1221,7 @@ function on_ws_recv(evt)
break; break;
case "cpuusage": case "cpuusage":
var server_cpu_usage = json.value; var server_cpu_usage = json.value;
progressbar_set(e("openwebrx-bar-server-cpu"),server_cpu_usage/100,"Server CPU [" + server_cpu_usage + "%]",server_cpu_usage>85); progressbar_set(e("openwebrx-bar-server-cpu"),server_cpu_usage,"Server CPU [" + Math.round(server_cpu_usage * 100) + "%]",server_cpu_usage>85);
break; break;
case "clients": case "clients":
var clients = json.value; var clients = json.value;

3
owrx/source.py
View File

@ -452,8 +452,6 @@ class CpuUsageThread(threading.Thread):
c.write_cpu_usage(cpu_usage) c.write_cpu_usage(cpu_usage)
time.sleep(3) time.sleep(3)
logger.debug("cpu usage thread shut down") logger.debug("cpu usage thread shut down")
if CpuUsageThread.sharedInstance == self:
CpuUsageThread.sharedInstance = None
def get_cpu_usage(self): def get_cpu_usage(self):
try: try:
@ -486,6 +484,7 @@ class CpuUsageThread(threading.Thread):
self.shutdown() self.shutdown()
def shutdown(self): def shutdown(self):
CpuUsageThread.sharedInstance = None
self.doRun = False self.doRun = False
class ClientReportingThread(threading.Thread): class ClientReportingThread(threading.Thread):