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

capture error code on user deletion issues

Browse Source 
addresses #501
This commit is contained in:
Adarnof 2016-07-11 15:33:32 +00:00 committed by GitHub
parent 6ab73dbb41
commit eeea5ce14e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
services/managers/teamspeak3_manager.py
View File

@ -224,15 +224,22 @@ 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:
for client in server.send_command('clientlist'): for client in server.send_command('clientlist'):
try:
if client['keys']['client_database_id'] == user: if client['keys']['client_database_id'] == user:
logger.debug("Found user %s on TS3 server - issuing deletion command." % user) logger.debug("Found user %s on TS3 server - issuing deletion command." % user)
server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5, server.send_command('clientkick', {'clid': client['keys']['clid'], 'reasonid': 5,
'reasonmsg': 'Auth service deleted'}) 'reasonmsg': 'Auth service deleted'})
except:
logger.exception("Failed to delete user id %s from TS3 - received response %s" % (uid, client))
return False
ret = server.send_command('clientdbdelete', {'cldbid': user}) ret = server.send_command('clientdbdelete', {'cldbid': user})
if ret == '0': if ret == '0':
logger.info("Deleted user with id %s from TS3 server." % uid) logger.info("Deleted user with id %s from TS3 server." % 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