diff --git a/groupmanagement/views.py b/groupmanagement/views.py index 6aec1e54..8801a387 100755 --- a/groupmanagement/views.py +++ b/groupmanagement/views.py @@ -49,7 +49,7 @@ def group_accept_request(request, group_request_id): group_request.delete() logger.info("User %s accepted group request from user %s to group %s" % (request.user, group_request.user, group_request.group.name)) except: - logger.exception("Unhandled exception occured while user %s attempting to accept grouprequest id %s." % (request.user, group_request_id), exc_info=True) + logger.exception("Unhandled exception occured while user %s attempting to accept grouprequest id %s." % (request.user, group_request_id)) pass return HttpResponseRedirect("/group/management/") @@ -66,7 +66,7 @@ def group_reject_request(request, group_request_id): logger.info("User %s rejected group request from user %s to group %s" % (request.user, group_request.user, group_request.group.name)) group_request.delete() except: - logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s" % (request.user, group_request_id), exc_info=True) + logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s" % (request.user, group_request_id)) pass return HttpResponseRedirect("/group/management/") @@ -84,7 +84,7 @@ def group_leave_accept_request(request, group_request_id): group_request.delete() logger.info("User %s accepted group leave request from user %s to group %s" % (request.user, group_request.user, group_request.group.name)) except: - logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s" % (request.user, group_request_id), exc_info=True) + logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s" % (request.user, group_request_id)) pass return HttpResponseRedirect("/group/management/") @@ -101,7 +101,7 @@ def group_leave_reject_request(request, group_request_id): group_request.delete() logger.info("User %s rejected group leave request from user %s for group %s" % (request.user, group_request.user, group_request.group.name)) except: - logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s" % (request.user, group_request_id), exc_info=True) + logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s" % (request.user, group_request_id)) pass return HttpResponseRedirect("/group/management/") diff --git a/services/managers/discord_manager.py b/services/managers/discord_manager.py index f1310b64..ef33dc99 100644 --- a/services/managers/discord_manager.py +++ b/services/managers/discord_manager.py @@ -399,7 +399,7 @@ class DiscordManager: logger.info("Added user to discord server %s with id %s" % (settings.DISCORD_SERVER_ID, user_id)) return user_id except: - logger.exception("An unhandled exception has occured.", exc_info=True) + logger.exception("An unhandled exception has occured.") return "" @staticmethod @@ -412,5 +412,5 @@ class DiscordManager: logger.info("Deleted user with id %s from discord server id %s" % (user_id, settings.DISCORD_SERVER_ID)) return True except: - logger.exception("An unhandled exception has occured.", exc_info=True) + logger.exception("An unhandled exception has occured.") return False diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py index 64696e2e..6d5f1964 100644 --- a/services/managers/eve_api_manager.py +++ b/services/managers/eve_api_manager.py @@ -22,7 +22,7 @@ class EveApiManager(): account = evelink.account.Account(api=api) chars = account.characters() except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") logger.debug("Retrieved characters %s from api id %s" % (chars, api_id)) return chars @@ -38,7 +38,7 @@ class EveApiManager(): logger.debug("Retrieved corp sheet for id %s: %s" % (corp_id, response)) ticker = response[0]['ticker'] except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") logger.debug("Determined corp id %s ticker: %s" % (corp_id, ticker)) return ticker @@ -53,7 +53,7 @@ class EveApiManager(): alliance = eve.alliances() results = alliance[0][int(alliance_id)] except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") logger.debug("Got alliance info %s" % results) return results @@ -67,7 +67,7 @@ class EveApiManager(): corpinfo = corp.corporation_sheet(corp_id=int(corp_id)) results = corpinfo[0] except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") logger.debug("Got corp info %s" % results) return results @@ -82,7 +82,7 @@ class EveApiManager(): return info[0]['type'] == "account" except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return None @@ -97,7 +97,7 @@ class EveApiManager(): return info[0]['access_mask'] & int(settings.MEMBER_API_MASK) == int(settings.MEMBER_API_MASK) except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return None @staticmethod @@ -111,7 +111,7 @@ class EveApiManager(): return info[0]['access_mask'] & int(settings.BLUE_API_MASK) == int(settings.BLUE_API_MASK) except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return None @@ -126,7 +126,7 @@ class EveApiManager(): return info except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return None @staticmethod @@ -139,7 +139,7 @@ class EveApiManager(): logger.info("Verified api id %s is still valid." % api_id) return True except evelink.api.APIError as error: - logger.exception("APIError occured while validating api id %s" % api_id, exc_info=True) + logger.exception("APIError occured while validating api id %s" % api_id) logger.info("API id %s is invalid." % api_id) return False @@ -154,7 +154,7 @@ class EveApiManager(): logger.info("Verified API server is online and reachable.") return True except evelink.api.APIError as error: - logger.exception("APIError occured while trying to query api server. Possibly offline?", exc_info=True) + logger.exception("APIError occured while trying to query api server. Possibly offline?") logger.warn("Unable to reach API server.") return False @@ -170,7 +170,7 @@ class EveApiManager(): logger.debug("Confirmed id %s is a corp." % corp_id) return True except evelink.api.APIError as error: - logger.exception("APIError occured while checking if id %s is corp. Possibly not corp?" % corp_id, exc_info=True) + logger.exception("APIError occured while checking if id %s is corp. Possibly not corp?" % corp_id) logger.debug("Unable to verify id %s is corp." % corp_id) return False @@ -203,7 +203,7 @@ class EveApiManager(): logger.debug("Got corp membertracking from settings: %s" % results) return results except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return {} @@ -219,7 +219,7 @@ class EveApiManager(): logger.debug("Confirmed id %s is an alliance." % alliance_id) return True except evelink.api.APIError as error: - logger.exception("APIError occured while checking if id %s is an alliance. Possibly not alliance?" % alliance_id, exc_info=True) + logger.exception("APIError occured while checking if id %s is an alliance. Possibly not alliance?" % alliance_id) logger.debug("Unable to verify id %s is an an alliance." % alliance_id) return False @@ -235,7 +235,7 @@ class EveApiManager(): logger.debug("Confirmed id %s is a character." % character_id) return True except evelink.api.APIError as error: - logger.exception("APIError occured while checking if id %s is a character. Possibly not character?" % character_id, exc_info=True) + logger.exception("APIError occured while checking if id %s is a character. Possibly not character?" % character_id) logger.debug("Unable to verify id %s is a character." % character_id) return False @@ -254,11 +254,11 @@ class EveApiManager(): logger.debug("Verified alliance id %s does not exist." % alliance_id) return False except evelink.api.APIError as error: - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return False except ValueError as error: #attempts to catch error resulting from checking alliance_of nonetype models - logger.exception("Unhandled ValueError occured. Possible nonetype alliance model.", exc_info=True) + logger.exception("Unhandled ValueError occured. Possible nonetype alliance model.") return False logger.warn("Exception prevented verification of alliance id %s existance. Assuming false." % alliance_id) return False @@ -278,7 +278,7 @@ class EveApiManager(): return False except evelink.api.APIError as error: #could be smart and check for error code523 to verify error due to no corp instead of catch-all - logger.exception("Unhandled APIError occured.", exc_info=True) + logger.exception("Unhandled APIError occured.") return False logger.warn("Exception prevented verification of corp id %s existance. Assuming false." % corp_id) return False diff --git a/services/managers/mumble_manager.py b/services/managers/mumble_manager.py index 68d157df..c312e00e 100755 --- a/services/managers/mumble_manager.py +++ b/services/managers/mumble_manager.py @@ -153,9 +153,9 @@ class MumbleManager: logger.info("Added user to mumble with username %s" % username_clean) return username_clean, password except django.db.utils.IntegrityError as error: - logger.exception("IntegrityError during mumble create_user occured.", exc_info=True) + logger.exception("IntegrityError during mumble create_user occured.") except: - logger.exception("Unhandled exception occured.", exc_info=True) + logger.exception("Unhandled exception occured.") logger.error("Exception prevented creation of mumble user. Returning blank for username, password.") return "", "" @@ -177,7 +177,7 @@ class MumbleManager: logger.info("Added blue user to mumble with username %s" % username_clean) return username_clean, password except: - logger.exception("Unhandled exception occured.", exc_info=True) + logger.exception("Unhandled exception occured.") logger.error("Exception prevented creation of mumble blue user. Returning blank for username, password.") return "", "" @@ -207,7 +207,7 @@ class MumbleManager: logger.info("Deleted user %s from mumble." % username) return True except: - logger.exception("Exception prevented deletion of user %s from mumble." % username, exc_info=True) + logger.exception("Exception prevented deletion of user %s from mumble." % username) return False logger.error("User %s not found on mumble. Unable to delete." % username) return False @@ -228,7 +228,7 @@ class MumbleManager: logger.info("Updated mumble user %s password." % username) return password except: - logger.exception("Exception prevented updating of mumble user %s password." % username, exc_info=True) + logger.exception("Exception prevented updating of mumble user %s password." % username) return "" logger.error("User %s not found on mumble. Unable to update password." % username) return "" @@ -250,11 +250,11 @@ class MumbleManager: logger.debug("Adding mumble user %s to group %s" % (userid, mumble_groups[g])) MumbleManager._add_user_to_group(userid, mumble_groups[g]) except: - logger.exception("Exception occured while adding mumble user %s with id %s to group %s with id %s" % (username, userid, g, mumble_groups[g]), exc_info=True) + logger.exception("Exception occured while adding mumble user %s with id %s to group %s with id %s" % (username, userid, g, mumble_groups[g])) for g in remgroups: try: logger.debug("Deleting mumble user %s from group %s" % (userid, mumble_groups[g])) MumbleManager._del_user_from_group(userid, mumble_groups[g]) except: - logger.exception("Exception occured while removing mumble user %s with id %s from group %s with id %s" % (username, userid, g, mumble_groups[g]), exc_info=True) + logger.exception("Exception occured while removing mumble user %s with id %s from group %s with id %s" % (username, userid, g, mumble_groups[g])) diff --git a/services/managers/phpbb3_manager.py b/services/managers/phpbb3_manager.py index 21c27c6f..1ffe7046 100755 --- a/services/managers/phpbb3_manager.py +++ b/services/managers/phpbb3_manager.py @@ -132,7 +132,7 @@ class Phpbb3Manager: cursor.execute(Phpbb3Manager.SQL_CLEAR_USER_PERMISSIONS, [userid]) 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) + logger.exception("Unable to add phpbb user id %s to group id %s" % (userid, groupid)) pass @staticmethod @@ -144,7 +144,7 @@ class Phpbb3Manager: cursor.execute(Phpbb3Manager.SQL_CLEAR_USER_PERMISSIONS, [userid]) logger.info("Removed phpbb user id %s from group id %s" % (userid, groupid)) except: - logger.exception("Unable to remove phpbb user id %s from group id %s" % (userid, groupid), exc_info=True) + logger.exception("Unable to remove phpbb user id %s from group id %s" % (userid, groupid)) pass @staticmethod @@ -170,7 +170,7 @@ class Phpbb3Manager: Phpbb3Manager.__add_avatar(username_clean, characterid) logger.info("Added phpbb user %s" % username_clean) except: - logger.exception("Unable to add phpbb user %s" % username_clean, exc_info=True) + logger.exception("Unable to add phpbb user %s" % username_clean) pass return username_clean, password @@ -188,7 +188,7 @@ class Phpbb3Manager: logger.info("Disabled phpbb user %s" % username) return True except TypeError as e: - logger.exception("TypeError occured while disabling user %s - failed to disable." % username, exc_info=True) + logger.exception("TypeError occured while disabling user %s - failed to disable." % username) return False @staticmethod @@ -236,7 +236,7 @@ class Phpbb3Manager: cursor.execute(Phpbb3Manager.SQL_REMOVE_USER_GROUP, [userid, groupid]) logger.info("Removed phpbb user %s from group %s" % (username, group)) except: - logger.exception("Exception prevented removal of phpbb user %s with id %s from group %s with id %s" % (username, userid, group, groupid), exc_info=True) + logger.exception("Exception prevented removal of phpbb user %s with id %s from group %s with id %s" % (username, userid, group, groupid)) pass @staticmethod @@ -275,5 +275,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) pass diff --git a/services/managers/teamspeak3_manager.py b/services/managers/teamspeak3_manager.py index 76532fba..1bc86067 100755 --- a/services/managers/teamspeak3_manager.py +++ b/services/managers/teamspeak3_manager.py @@ -162,7 +162,7 @@ class Teamspeak3Manager: logger.debug("Local group does not exist for TS group %s. Creating TSgroup model %s" % (remote_groups[key], g)) g.save() except: - logger.exception("An unhandled exception has occured while syncing TS groups.", exc_info=True) + logger.exception("An unhandled exception has occured while syncing TS groups.") pass @staticmethod diff --git a/services/views.py b/services/views.py index 83ffbce9..ab08dbd8 100755 --- a/services/views.py +++ b/services/views.py @@ -459,7 +459,7 @@ def activate_discord(request): logger.info("Succesfully activated discord for user %s" % request.user) return HttpResponseRedirect("/services/") except: - logger.exception("An unhandled exception has occured.", exc_info=True) + logger.exception("An unhandled exception has occured.") pass else: logger.debug("Request is not type POST - providing empty form.")