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

Minor tweaks.

Browse Source
This commit is contained in:
A. Svensson 2015-04-06 11:45:38 +02:00
parent 5fc67d27d2
commit 290f696ae5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gameservers/data_sources.py
View File

@ -8,13 +8,12 @@ import requests
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
def poll_ss13_server(host, port, timeout=10): def poll_ss13_server(host, port, 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
print 'polling:', host, port print 'polling:', host, port
cmd = '?players' query = '\x00\x83{0}\x00\x00\x00\x00\x00?players\x00'.format(
query = '\x00\x83{0}\x00\x00\x00\x00\x00{1}\x00'.format( struct.pack('>H', 14) # 14 = 6 null bytes + len(?players)
struct.pack('>H', len(cmd) + 6), cmd
) )
try: try:
@ -40,7 +39,7 @@ def poll_ss13_server(host, port, timeout=10):
class ServerPoller(object): class ServerPoller(object):
def __init__(self, timeout=30): def __init__(self, timeout=10):
self.timeout = timeout self.timeout = timeout
self.workers = 5 self.workers = 5
@ -61,7 +60,7 @@ class ServerPoller(object):
pool = Pool(processes=self.workers) pool = Pool(processes=self.workers)
results = [] results = []
for (host, port) in targets: for (host, port) in targets:
future = pool.apply_async(poll_ss13_server, (host, port)) future = pool.apply_async(poll_ss13_server, (host, port, timeout))
results.append(future) results.append(future)
pool.close() pool.close()
@ -94,8 +93,6 @@ class ServerScraper(object):
# TODO: Better regexp that can't be spoofed by server names # TODO: Better regexp that can't be spoofed by server names
self.PLAYERS = re.compile('Logged in: (\d+) player') self.PLAYERS = re.compile('Logged in: (\d+) player')
def run(self): def run(self):
'''Run the parser and return a neat list of dicts containing server data.''' '''Run the parser and return a neat list of dicts containing server data.'''
raw_data = self._download_data() raw_data = self._download_data()