erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code optimization for readability.

Browse Source
This commit is contained in:
A. Svensson 2015-04-06 12:27:43 +02:00
parent f3411362df
commit d139364722
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gameservers/data_sources.py
View File

@ -9,6 +9,7 @@ from bs4 import BeautifulSoup
from .models import PrivateServer from .models import PrivateServer
def poll_ss13_server(server, timeout=30): def poll_ss13_server(server, timeout=30):
# Thanks to /u/headswe for showing how to poll servers. # Thanks to /u/headswe for showing how to poll servers.
# Source: http://www.reddit.com/r/SS13/comments/31b5im/a_bunch_of_graphs_for_all_servers/cq11nld # Source: http://www.reddit.com/r/SS13/comments/31b5im/a_bunch_of_graphs_for_all_servers/cq11nld
@ -20,23 +21,19 @@ def poll_ss13_server(server, timeout=30):
try: try:
sock = socket.create_connection(addr, timeout=timeout) sock = socket.create_connection(addr, timeout=timeout)
except socket.timeout:
return 0, server
try:
sock.sendall(query) sock.sendall(query)
response = sock.recv(1024) response = sock.recv(1024)
except socket.timeout:
response = ''
sock.close() sock.close()
if len(response) < 1: assert(len(response) > 0)
return 0, server assert(response[:5] == '\x00\x83\x00\x05\x2a')
else:
if not response[:5] == '\x00\x83\x00\x05\x2a':
return 0, server
tmp = struct.unpack('f', response[5:9]) tmp = struct.unpack('f', response[5:9])
return int(tmp[0]), server return int(tmp[0]), server
except (socket.timeout, AssertionError) as e:
try:
sock.close()
except UnboundLocalError:
pass
return 0, server
class ServerPoller(object): class ServerPoller(object):