Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix speedtest.py

This commit is contained in:
wh1te909 2021-04-30 07:18:13 +00:00
parent afb1316daa
commit d7e11af7f8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/Speedtest.py
View File

@ -37,7 +37,7 @@ except ImportError:
gzip = None gzip = None
GZIP_BASE = object GZIP_BASE = object
__version__ = "2.1.2" __version__ = "2.1.3"
class FakeShutdownEvent(object): class FakeShutdownEvent(object):
@ -728,7 +728,9 @@ def build_request(url, data=None, headers=None, bump="0", secure=False):
) )
headers.update( headers.update(
{"Cache-Control": "no-cache",} {
"Cache-Control": "no-cache",
}
) )
printer("%s %s" % (("GET", "POST")[bool(data)], final_url), debug=True) printer("%s %s" % (("GET", "POST")[bool(data)], final_url), debug=True)
@ -840,6 +842,8 @@ class HTTPDownloader(threading.Thread):
f.close() f.close()
except IOError: except IOError:
pass pass
except HTTP_ERRORS:
pass
class HTTPUploaderData(object): class HTTPUploaderData(object):
@ -907,7 +911,7 @@ class HTTPUploader(threading.Thread):
self.request = request self.request = request
self.request.data.start = self.starttime = start self.request.data.start = self.starttime = start
self.size = size self.size = size
self.result = None self.result = 0
self.timeout = timeout self.timeout = timeout
self.i = i self.i = i
@ -944,6 +948,8 @@ class HTTPUploader(threading.Thread):
self.result = 0 self.result = 0
except (IOError, SpeedtestUploadTimeout): except (IOError, SpeedtestUploadTimeout):
self.result = sum(self.request.data.total) self.result = sum(self.request.data.total)
except HTTP_ERRORS:
self.result = 0
class SpeedtestResults(object): class SpeedtestResults(object):
@ -1159,7 +1165,9 @@ class Speedtest(object):
self._best = {} self._best = {}
self.results = SpeedtestResults( self.results = SpeedtestResults(
client=self.config["client"], opener=self._opener, secure=secure, client=self.config["client"],
opener=self._opener,
secure=secure,
) )
@property @property
@ -1233,7 +1241,7 @@ class Speedtest(object):
# times = get_attributes_by_tag_name(root, 'times') # times = get_attributes_by_tag_name(root, 'times')
client = get_attributes_by_tag_name(root, "client") client = get_attributes_by_tag_name(root, "client")
ignore_servers = list(map(int, server_config["ignoreids"].split(","))) ignore_servers = [int(i) for i in server_config["ignoreids"].split(",") if i]
ratio = int(upload["ratio"]) ratio = int(upload["ratio"])
upload_max = int(upload["maxchunkcount"]) upload_max = int(upload["maxchunkcount"])