mbirth/tcl_ota_check
1
0
Fork 0
mirror of https://github.com/mbirth/tcl_ota_check.git synced 2024-09-19 22:33:25 +01:00
Code Issues Releases Wiki Activity

ServerSelector can now handle custom server lists (e.g. encservers).

Browse Source
This commit is contained in:
Markus Birth 2018-02-10 03:11:17 +01:00
parent a38f216607
commit 6bcb99b0c0
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tcllib/requests/serverselector.py
View File

@ -20,14 +20,18 @@ MASTER_SERVERS = [
class ServerSelector: class ServerSelector:
"""Returns a random server to use.""" """Returns a random server to use."""
def __init__(self): def __init__(self, server_list=None):
"""Init stuff""" """Init stuff"""
if server_list:
self.server_list = server_list
else:
self.server_list = MASTER_SERVERS
self.last_server = None self.last_server = None
def get_master_server(self): def get_master_server(self):
"""Return a random server.""" """Return a random server."""
while True: while True:
new_server = numpy.random.choice(MASTER_SERVERS) new_server = numpy.random.choice(self.server_list)
if new_server != self.last_server: if new_server != self.last_server:
break break
self.last_server = new_server self.last_server = new_server
@ -44,35 +48,35 @@ class ServerSelector:
class ServerVoteSelector(ServerSelector): class ServerVoteSelector(ServerSelector):
"""Tries to return faster servers more often.""" """Tries to return faster servers more often."""
def __init__(self): def __init__(self, server_list=None):
"""Populate server list and weighting variables.""" """Populate server list and weighting variables."""
self.last_server = None super().__init__(server_list)
self.master_servers_weights = [3] * len(MASTER_SERVERS) self.servers_weights = [3] * len(self.server_list)
self.check_time_sum = 3 self.check_time_sum = 3
self.check_time_count = 1 self.check_time_count = 1
def get_master_server(self): def get_master_server(self):
"""Return weighted choice from server list.""" """Return weighted choice from server list."""
weight_sum = 0 weight_sum = 0
for i in self.master_servers_weights: for i in self.servers_weights:
weight_sum += i weight_sum += i
numpy_weights = [] numpy_weights = []
for i in self.master_servers_weights: for i in self.servers_weights:
numpy_weights.append(i/weight_sum) numpy_weights.append(i/weight_sum)
self.last_server = numpy.random.choice(MASTER_SERVERS, p=numpy_weights) self.last_server = numpy.random.choice(self.server_list, p=numpy_weights)
return self.last_server return self.last_server
def master_server_downvote(self): def master_server_downvote(self):
"""Decrease weight of last chosen server.""" """Decrease weight of last chosen server."""
idx = MASTER_SERVERS.index(self.last_server) idx = self.server_list.index(self.last_server)
if self.master_servers_weights[idx] > 1: if self.servers_weights[idx] > 1:
self.master_servers_weights[idx] -= 1 self.servers_weights[idx] -= 1
def master_server_upvote(self): def master_server_upvote(self):
"""Increase weight of last chosen server.""" """Increase weight of last chosen server."""
idx = MASTER_SERVERS.index(self.last_server) idx = self.server_list.index(self.last_server)
if self.master_servers_weights[idx] < 10: if self.servers_weights[idx] < 10:
self.master_servers_weights[idx] += 1 self.servers_weights[idx] += 1
def check_time_add(self, duration): def check_time_add(self, duration):
"""Record connection time.""" """Record connection time."""