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

remove check for dictionary structure

Browse Source 
allows exceptions to occur for logging
This commit is contained in:
Adarnof 2016-05-09 17:50:54 -04:00
parent 8a691fcd6b
commit 18b1a576d7
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
services/managers/teamspeak3_manager.py
View File

@ -182,14 +182,12 @@ class Teamspeak3Manager:
'tokencustomset': "ident=sso_uid value=%s" % username_clean}) 'tokencustomset': "ident=sso_uid value=%s" % username_clean})
try: try:
if 'keys' in ret: token = ret['keys']['token']
if 'token' in ret['keys']: logger.info("Created permission token for user %s on TS3 server" % username_clean)
token = ret['keys']['token'] return username_clean, token
logger.info("Created permission token for user %s on TS3 server" % username_clean)
return username_clean, token
except: except:
logger.exception("Failed to add teamspeak user %s - received response: %s" % (username, ret)) logger.exception("Failed to add teamspeak user %s - received response: %s" % (username_clean, ret))
return "","" return "",""
@staticmethod @staticmethod
def add_blue_user(username, corp_ticker): def add_blue_user(username, corp_ticker):
@ -209,14 +207,12 @@ class Teamspeak3Manager:
'tokencustomset': "ident=sso_uid value=%s" % username_clean}) 'tokencustomset': "ident=sso_uid value=%s" % username_clean})
try: try:
if 'keys' in ret: token = ret['keys']['token']
if 'token' in ret['keys']: logger.info("Created permission token for blue user %s on TS3 server" % username_clean)
token = ret['keys']['token'] return username_clean, token
logger.info("Created permission token for blue user %s on TS3 server" % username_clean)
return username_clean, token
except: except:
logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username, ret)) logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username_clean, ret))
return "","" return "",""