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

Fix race condition while iterating over clients

Browse Source
This commit is contained in:
Giuseppe Guerra
2017-08-12 19:07:28 +02:00
parent 176775f8f3
commit 8d97227965
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
constants/fokabotCommands.py
View File

@@ -114,9 +114,10 @@ def moderated(fro, chan, message):
def kickAll(fro, chan, message):
# Kick everyone but mods/admins
toKick = []
for key, value in glob.tokens.tokens.items():
if not value.admin:
toKick.append(key)
with glob.tokens:
for key, value in glob.tokens.tokens.items():
if not value.admin:
toKick.append(key)
# Loop though users to kick (we can't change dictionary size while iterating)
for i in toKick:
@@ -336,9 +337,10 @@ def systemMaintenance(fro, chan, message):
who = []
# Disconnect everyone but mod/admins
for _, value in glob.tokens.tokens.items():
if not value.admin:
who.append(value.userID)
with glob.tokens:
for _, value in glob.tokens.tokens.items():
if not value.admin:
who.append(value.userID)
glob.streams.broadcast("main", serverPackets.notification("Our bancho server is in maintenance mode. Please try to login again later."))
glob.tokens.multipleEnqueue(serverPackets.loginError(), who)