From cd44f00881b0fff5716993a78f758fe44340ffec Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 30 Dec 2015 11:22:40 +0000 Subject: [PATCH] Finished auditing service manager logging. --- services/managers/phpbb3_manager.py | 6 +++--- services/managers/teamspeak3_manager.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 1ee0a1cb..89d36fb4 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -79,7 +79,7 @@ class Phpbb3Manager: logger.debug("Got phpbb user id %s for username %s" % (row[0], username)) return row[0] else: - logger.warn("Username %s not found on phpbb." % username) + logger.warn("Username %s not found on phpbb. Unable to determine user id." % username) return None @staticmethod @@ -119,7 +119,7 @@ class Phpbb3Manager: try: cursor = connections['phpbb3'].cursor() cursor.execute(Phpbb3Manager.SQL_ADD_USER_GROUP, [groupid, userid, 0]) - logger.info("Added phpbb user id to group id %s" % (userid, groupid)) + logger.info("Added phpbb user id %s to group id %s" % (userid, groupid)) except: logger.exception("Unable to add phpbb user id %s to group id %s" % (userid, groupid), exc_info=True) pass @@ -262,5 +262,5 @@ class Phpbb3Manager: cursor.execute(Phpbb3Manager.SQL_DIS_USER, [email, password, username]) logger.info("Updated phpbb user %s info" % username) except: - logger.exception("Unable to update phpbb user %s info." % username, exc_info=True + logger.exception("Unable to update phpbb user %s info." % username, exc_info=True) pass diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index 700bef61..c1818cee 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -110,7 +110,6 @@ class Teamspeak3Manager: outlist[group['keys']['name']] = group['keys']['sgid'] else: logger.error("Received empty group cache while retrieving group cache from TS3 server. 1024 error.", exc_info=True) - print '1024 error' logger.debug("Returning name/id pairing: %s" % outlist) return outlist @@ -280,7 +279,7 @@ class Teamspeak3Manager: if user_ts_groups[user_ts_group_key] not in ts_groups.values(): remgroups.append(user_ts_groups[user_ts_group_key]) - logger.info("Finished checking user id %s groups. Adding %s, removing %s." % (uid, addgroups, remgroups)) + logger.info("Finished checking user id %s groups. Adding %s, removing %s." % (userid, addgroups, remgroups)) for g in addgroups: logger.debug("Issuing add command for group %s" % g)