Correct total values calc
parent
e7daf11d72
commit
f9146669ec
|
|
@ -345,8 +345,8 @@ def threaded_wan_speed():
|
|||
global wan_download
|
||||
global wan_upload
|
||||
|
||||
wan_download = max(downloads['total'])
|
||||
wan_upload = max(uploads['total'])
|
||||
# wan_download = max(downloads['total'])
|
||||
# wan_upload = max(uploads['total'])
|
||||
|
||||
data_dict['wan_downloads'] = {}
|
||||
data_dict['wan_uploads'] = {}
|
||||
|
|
@ -354,7 +354,6 @@ def threaded_wan_speed():
|
|||
data_dict['wan_downloads']['total'] = 0
|
||||
data_dict['wan_uploads']['total'] = 0
|
||||
|
||||
|
||||
for key, value in downloads.items():
|
||||
if key != 'total':
|
||||
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']['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;")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue