Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-11 13:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent errors when deleting users before joining TS3

Browse Source 
Closes #554
This commit is contained in:
Adarnof 2016-10-25 22:07:35 +00:00
parent 00341f8a50
commit 6d2036e84b
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
services/managers/teamspeak3_manager.py
View File

@ -243,33 +243,26 @@ class Teamspeak3Manager:
logger.debug("Deleting user %s with id %s from TS3 server." % (user, uid)) logger.debug("Deleting user %s with id %s from TS3 server." % (user, uid))
if user: if user:
clients = server.send_command('clientlist') clients = server.send_command('clientlist')
logger.debug(clients['keys']) for client in clients:
if clients['keys']:
for client in clients:
try:
if client['keys']['client_database_id'] == user:
logger.debug("Found user %s on TS3 server - issuing deletion command." % user)
server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5,
'reasonmsg': 'Auth service deleted'})
except:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, client))
return False
try: try:
ret = server.send_command('clientdbdelete', {'cldbid': user}) if client['keys']['client_database_id'] == user:
except TeamspeakError as e: logger.debug("Found user %s on TS3 server - issuing deletion command." % user)
logger.error("Failed to delete teamspeak user %s: %s" % (uid, str(e))) server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5,
'reasonmsg': 'Auth service deleted'})
except:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, client))
return False return False
try:
if ret == '0': ret = server.send_command('clientdbdelete', {'cldbid': user})
logger.info("Deleted user with id %s from TS3 server." % uid) except TeamspeakError as e:
return True logger.error("Failed to delete teamspeak user %s: %s" % (uid, str(e)))
else: return False
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, ret)) if ret == '0':
return False logger.info("Deleted user with id %s from TS3 server." % uid)
else:
logger.warning('Received no clients from TS3 server. Assuming user %s already deleted.' % uid)
return True return True
else:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, ret))
return False
else: else:
logger.warn("User with id %s not found on TS3 server. Assuming succesful deletion." % uid) logger.warn("User with id %s not found on TS3 server. Assuming succesful deletion." % uid)
return True return True