Nix
/
BroSpeedTester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct total values calc

master
Nixellion 2020-07-20 03:11:59 +03:00
parent e7daf11d72
commit f9146669ec
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
speedtester.py
View File

@ -345,8 +345,8 @@ def threaded_wan_speed():
global wan_download global wan_download
global wan_upload global wan_upload
wan_download = max(downloads['total']) # wan_download = max(downloads['total'])
wan_upload = max(uploads['total']) # wan_upload = max(uploads['total'])
data_dict['wan_downloads'] = {} data_dict['wan_downloads'] = {}
data_dict['wan_uploads'] = {} data_dict['wan_uploads'] = {}
@ -354,7 +354,6 @@ def threaded_wan_speed():
data_dict['wan_downloads']['total'] = 0 data_dict['wan_downloads']['total'] = 0
data_dict['wan_uploads']['total'] = 0 data_dict['wan_uploads']['total'] = 0
for key, value in downloads.items(): for key, value in downloads.items():
if key != 'total': if key != 'total':
data_dict['wan_downloads'][key] = max(value) data_dict['wan_downloads'][key] = max(value)
@ -364,6 +363,9 @@ def threaded_wan_speed():
data_dict['wan_uploads'][key] = max(value) data_dict['wan_uploads'][key] = max(value)
data_dict['wan_uploads']['total'] += data_dict['wan_uploads'][key] data_dict['wan_uploads']['total'] += data_dict['wan_uploads'][key]
wan_download = data_dict['wan_downloads']['total']
wan_upload = data_dict['wan_uploads']['total']
log.info(f"Monitor result: {mbits(wan_download)} mbps; {mbits(wan_upload)} mbps;") log.info(f"Monitor result: {mbits(wan_download)} mbps; {mbits(wan_upload)} mbps;")