mbirth/tcl_ota_check
1
0
Fork 0
mirror of https://github.com/mbirth/tcl_ota_check.git synced 2024-11-10 06:16:46 +00:00
Code Issues Releases Wiki Activity

Implemented weighting by response time.

Browse Source
This commit is contained in:
Markus Birth 2017-10-06 01:37:10 +02:00
parent f4319fcbbf
commit 9253cf7f1f
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tcllib.py
View File

@ -69,6 +69,8 @@ class FotaCheck:
"g2master-sa-east.tclclouds.com", "g2master-sa-east.tclclouds.com",
] ]
self.master_servers_weights = [3] * len(self.master_servers) self.master_servers_weights = [3] * len(self.master_servers)
self.check_time_sum = 3
self.check_time_count = 1
self.reset_session() self.reset_session()
def reset_session(self): def reset_session(self):
@ -99,6 +101,19 @@ class FotaCheck:
if self.master_servers_weights[idx] < 10: if self.master_servers_weights[idx] < 10:
self.master_servers_weights[idx] += 1 self.master_servers_weights[idx] += 1
def check_time_add(self, duration):
self.check_time_sum += duration
self.check_time_count += 1
def check_time_avg(self):
return (self.check_time_sum / self.check_time_count)
def master_server_vote_on_time(self, last_duration, avg_duration):
if last_duration < avg_duration - 0.5:
self.master_server_upvote()
elif last_duration > avg_duration + 0.5:
self.master_server_downvote()
def do_check(self, https=True, timeout=10, max_tries=5): def do_check(self, https=True, timeout=10, max_tries=5):
protocol = "https://" if https else "http://" protocol = "https://" if https else "http://"
url = protocol + self.g2master + "/check.php" url = protocol + self.g2master + "/check.php"
@ -117,16 +132,20 @@ class FotaCheck:
last_response = None last_response = None
for num_try in range(0, max_tries): for num_try in range(0, max_tries):
try: try:
reqtime_start = time.perf_counter()
req = self.sess.get(url, params=params, timeout=timeout) req = self.sess.get(url, params=params, timeout=timeout)
reqtime = time.perf_counter() - reqtime_start
reqtime_avg = self.check_time_avg()
self.check_time_add(reqtime)
last_response = req last_response = req
if req.status_code == 200: if req.status_code == 200:
self.master_server_upvote() self.master_server_vote_on_time(reqtime, reqtime_avg)
return req.text return req.text
elif req.status_code == 204: elif req.status_code == 204:
self.master_server_upvote() self.master_server_vote_on_time(reqtime, reqtime_avg)
raise requests.exceptions.HTTPError("No update available.", response=req) raise requests.exceptions.HTTPError("No update available.", response=req)
elif req.status_code == 404: elif req.status_code == 404:
self.master_server_upvote() self.master_server_vote_on_time(reqtime, reqtime_avg)
raise requests.exceptions.HTTPError("No data for requested CUREF/FV combination.", response=req) raise requests.exceptions.HTTPError("No data for requested CUREF/FV combination.", response=req)
elif req.status_code not in [500, 503]: elif req.status_code not in [500, 503]:
self.master_server_downvote() self.master_server_downvote()