From 8a691fcd6b1da5d405141ea148095994e6a6ef61 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Mon, 9 May 2016 17:03:53 -0400 Subject: [PATCH] log TS3 errors on user creation returns no username on failure to prevent storing empty perm key in authservicesinfo models --- services/managers/teamspeak3_manager.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index 681e735f..f6f105cd 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -185,11 +185,11 @@ class Teamspeak3Manager: if 'keys' in ret: if 'token' in ret['keys']: token = ret['keys']['token'] + logger.info("Created permission token for user %s on TS3 server" % username_clean) + return username_clean, token except: - pass - logger.info("Created permission token for user %s on TS3 server" % username_clean) - - return username_clean, token + logger.exception("Failed to add teamspeak user %s - received response: %s" % (username, ret)) + return "","" @staticmethod def add_blue_user(username, corp_ticker): @@ -212,12 +212,14 @@ class Teamspeak3Manager: if 'keys' in ret: if 'token' in ret['keys']: token = ret['keys']['token'] - + logger.info("Created permission token for blue user %s on TS3 server" % username_clean) + return username_clean, token except: - pass - logger.info("Created permission token for blue user %s on TS3 server" % username_clean) + logger.exception("Failed to add blue teamspeak user %s - received response: %s" % (username, ret)) + return "","" + - return username_clean, token + @staticmethod def delete_user(uid):