EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.BANCHO. .FIX. Don't time out tourney clients

Browse Source
This commit is contained in:
Nyo
2016-10-09 19:12:18 +02:00
parent e7b7dc932a
commit 90dfb2c705
6 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
objects/osuToken.py
View File

@@ -190,7 +190,7 @@ class token:
self.enqueue(serverPackets.fellowSpectatorJoined(glob.tokens.tokens[i].userID))
# Log
log.info("{} is spectating {}".format(self.username, userUtils.getUsername(host.username)))
log.info("{} is spectating {}".format(self.username, host.username))
def stopSpectating(self):
# Remove our userID from host's spectators
@@ -316,14 +316,14 @@ class token:
# Set usertoken match to -1
self.matchID = -1
def kick(self, message="You have been kicked from the server. Please login again."):
def kick(self, message="You have been kicked from the server. Please login again.", reason="kick"):
"""
Kick this user from the server
message -- Notification message to send to this user. Optional.
"""
# Send packet to target
log.info("{} has been disconnected. (kick)".format(self.username))
log.info("{} has been disconnected. ({})".format(self.username, reason))
if message != "":
self.enqueue(serverPackets.notification(message))
self.enqueue(serverPackets.loginFailed())

11
objects/tokenList.py
View File

@@ -2,6 +2,8 @@ import threading
import time
from common.ripple import userUtils
from common.log import logUtils as log
from constants import serverPackets
from events import logoutEvent
from objects import glob
from objects import osuToken
@@ -108,7 +110,7 @@ class tokenList:
for key, value in list(self.tokens.items()):
if value.userID == userID:
# Delete this token from the dictionary
self.tokens[key].kick("You have logged in from somewhere else. You can't connect to Bancho/IRC from more than one device at the same time.")
self.tokens[key].kick("You have logged in from somewhere else. You can't connect to Bancho/IRC from more than one device at the same time.", "kicked, multiple clients")
def multipleEnqueue(self, packet, who, but = False):
"""
@@ -146,11 +148,12 @@ class tokenList:
timeoutTime - seconds of inactivity required to disconnect someone (Default: 100)
checkTime - seconds between loops (Default: 100)
"""
log.debug("Checking timed out clients")
timedOutTokens = [] # timed out users
timeoutLimit = time.time()-timeoutTime
timeoutLimit = int(time.time())-timeoutTime
for key, value in self.tokens.items():
# Check timeout (fokabot is ignored)
if value.pingTime < timeoutLimit and value.userID != 999 and value.irc == False:
if value.pingTime < timeoutLimit and value.userID != 999 and value.irc == False and value.tournament == False:
# That user has timed out, add to disconnected tokens
# We can't delete it while iterating or items() throws an error
timedOutTokens.append(key)
@@ -158,6 +161,8 @@ class tokenList:
# Delete timed out users from self.tokens
# i is token string (dictionary key)
for i in timedOutTokens:
log.debug("{} timed out!!".format(self.tokens[i].username))
self.tokens[i].enqueue(serverPackets.notification("Your connection to the server timed out."))
logoutEvent.handle(self.tokens[i], None)
# Schedule a new check (endless loop)