gitea/mcstatus
1
0
Fork 0
mirror of https://github.com/Dinnerbone/mcstatus.git synced 2026-04-06 12:01:24 +08:00
Code Issues Projects Releases Wiki Activity

Implemented retries on server.ping/query_server

Browse Source
This commit is contained in:
Nathan Adams
2014-09-07 01:15:42 +02:00
parent 08c368be12
commit 9340ab47c1
2 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mcstatus/server.py
View File

@@ -1,5 +1,3 @@
import json
from mcstatus.pinger import ServerPinger
from mcstatus.protocol.connection import TCPSocketConnection, UDPSocketConnection
from mcstatus.querier import ServerQuerier
@@ -10,14 +8,30 @@ class MinecraftServer:
self.host = host
self.port = port
def ping_server(self, **kwargs):
def ping_server(self, retries=3, **kwargs):
attempt = 0
connection = TCPSocketConnection((self.host, self.port))
pinger = ServerPinger(connection, host=self.host, port=self.port, **kwargs)
pinger.handshake()
return pinger.read_status(), pinger.test_ping()
exception = None
while attempt < retries:
try:
pinger = ServerPinger(connection, host=self.host, port=self.port, **kwargs)
pinger.handshake()
return pinger.read_status(), pinger.test_ping()
except Exception as e:
exception = e
attempt += 1
raise exception
def query_server(self):
connection = UDPSocketConnection((self.host, self.port))
querier = ServerQuerier(connection)
querier.handshake()
return querier.read_query()
def query_server(self, retries=3):
attempt = 0
exception = None
while attempt < retries:
try:
connection = UDPSocketConnection((self.host, self.port))
querier = ServerQuerier(connection)
querier.handshake()
return querier.read_query()
except Exception as e:
exception = e
attempt += 1
raise exception

16
mcstatus/tests/test_server.py
View File

@@ -23,6 +23,14 @@ class TestMinecraftServer(TestCase):
self.assertEqual(info.raw, {"description":"A Minecraft Server","players":{"max":20,"online":0},"version":{"name":"1.8","protocol":47}})
self.assertTrue(latency >= 0)
def test_ping_server_retry(self):
with patch("mcstatus.server.TCPSocketConnection") as connection:
connection.return_value = None
with patch("mcstatus.server.ServerPinger") as pinger:
pinger.side_effect = [Exception, Exception, Exception]
self.assertRaises(Exception, self.server.ping_server)
self.assertEqual(pinger.call_count, 3)
def test_query_server(self):
self.socket.receive(bytearray.fromhex("090000000035373033353037373800"))
self.socket.receive(bytearray.fromhex("00000000000000000000000000000000686f73746e616d650041204d696e656372616674205365727665720067616d657479706500534d500067616d655f6964004d494e4543524146540076657273696f6e00312e3800706c7567696e7300006d617000776f726c64006e756d706c61796572730033006d6178706c617965727300323000686f7374706f727400323535363500686f73746970003139322e3136382e35362e31000001706c617965725f000044696e6e6572626f6e6500446a696e6e69626f6e650053746576650000"))
@@ -47,3 +55,11 @@ class TestMinecraftServer(TestCase):
"hostport": "25565",
"hostip": "192.168.56.1",
})
def test_query_server_retry(self):
with patch("mcstatus.server.UDPSocketConnection") as connection:
connection.return_value = None
with patch("mcstatus.server.ServerQuerier") as querier:
querier.side_effect = [Exception, Exception, Exception]
self.assertRaises(Exception, self.server.query_server)
self.assertEqual(querier.call_count, 3)