def/pymaster
1
0
Fork 0
mirror of https://github.com/de2tla2f/pymaster.git synced 2024-11-27 05:11:29 +00:00
Code Issues Projects Releases Wiki Activity

improve debug

Browse source
This commit is contained in:
ghost 2024-01-08 21:10:13 +02:00
parent 45f1378679
commit f50347eac6
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pymaster.py
View file

@ -100,16 +100,20 @@ class PyMaster:
for i in self.serverList: for i in self.serverList:
if time() > i.die: if time() > i.die:
logging.debug("Server removed by timeout")
self.serverList.remove(i) self.serverList.remove(i)
continue continue
if not i.check: if not i.check:
logging.debug("Invalid request")
continue continue
if nat != i.nat: if nat != i.nat:
logging.debug("NAT {0} mismatch {1}".format(i.nat, nat))
continue continue
if gamedir is not None and gamedir != i.gamedir: if gamedir is not None and gamedir != i.gamedir:
logging.debug("Game dir {0} mismatch node settings: {1}".format(i.gamedir, gamedir))
continue continue
if nat: if nat:
@ -168,15 +172,18 @@ class PyMaster:
for i in self.serverList: for i in self.serverList:
if i.addr[0] == addr[0]: if i.addr[0] == addr[0]:
if i.addr[1] == addr[1]: if i.addr[1] == addr[1]:
logging.debug("Removed server {0}:{1} with same port as {0}:{1}".format(i.addr[0], i.addr[1], addr[0], addr[1]))
self.serverList.remove(i) self.serverList.remove(i)
else: else:
count += 1 count += 1
if count > MAX_SERVERS_FOR_IP: if count > MAX_SERVERS_FOR_IP:
logging.debug("Reached MAX_SERVERS_FOR_IP: {0}".format(MAX_SERVERS_FOR_IP))
return return
challenge = random.randint(0, 2**32 - 1) challenge = random.randint(0, 2**32 - 1)
# Add server to list # Add server to list
logging.debug("Added new server {0}:{1} with challenge {2}".format(addr[0], addr[1], challenge))
self.serverList.append(ServerEntry(addr, challenge)) self.serverList.append(ServerEntry(addr, challenge))
# And send him a challenge # And send him a challenge
@ -193,6 +200,7 @@ class PyMaster:
# Find a server with same address # Find a server with same address
for serverEntry in self.serverList: for serverEntry in self.serverList:
if serverEntry.addr == addr: if serverEntry.addr == addr:
logging.debug("Skipped same server address: {0}:{1}".format(addr[0], addr[1]))
break break
serverEntry.setInfoString(serverInfo) serverEntry.setInfoString(serverInfo)