From f9146669ec382fddd64dcbf8906a599c9566923c Mon Sep 17 00:00:00 2001 From: Nixellion Date: Mon, 20 Jul 2020 03:11:59 +0300 Subject: [PATCH] Correct total values calc --- speedtester.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/speedtester.py b/speedtester.py index 4e020e0..3b42d02 100644 --- a/speedtester.py +++ b/speedtester.py @@ -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;")