From 3188f89e473957809f59dbc8372eb21def536ce1 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Mon, 19 Oct 2015 22:51:36 +0000 Subject: [PATCH] Cleanup some logger functions which were missed in the merge conflict. --- evennia/commands/default/unloggedin.py | 4 ++-- evennia/contrib/email_login.py | 2 +- evennia/contrib/menu_login.py | 2 +- evennia/objects/models.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py index 9821bcb5a6..f436454141 100644 --- a/evennia/commands/default/unloggedin.py +++ b/evennia/commands/default/unloggedin.py @@ -141,7 +141,7 @@ class CmdUnconnectedConnect(MuxCommand): # to handle tracebacks ourselves at this point. If we don't, # we won't see any errors at all. session.msg("An error occurred. Please e-mail an admin if the problem persists.") - logger.log_errmsg(traceback.format_exc()) + logger.log_trace() finally: return @@ -287,7 +287,7 @@ class CmdUnconnectedCreate(MuxCommand): # to handle tracebacks ourselves at this point. If we don't, # we won't see any errors at all. session.msg("An error occurred. Please e-mail an admin if the problem persists.") - logger.log_errmsg(traceback.format_exc()) + logger.log_trace() class CmdUnconnectedQuit(MuxCommand): diff --git a/evennia/contrib/email_login.py b/evennia/contrib/email_login.py index 3303fe9943..8b46cec3af 100644 --- a/evennia/contrib/email_login.py +++ b/evennia/contrib/email_login.py @@ -258,7 +258,7 @@ its and @/./+/-/_ only.") # this echoes the restrictions made by django's auth m # to handle tracebacks ourselves at this point. If we don't, # we won't see any errors at all. session.msg("An error occurred. Please e-mail an admin if the problem persists.") - logger.log_errmsg(traceback.format_exc()) + logger.log_trace() class CmdUnconnectedQuit(MuxCommand): """ diff --git a/evennia/contrib/menu_login.py b/evennia/contrib/menu_login.py index 62eb59d435..92092bf8c4 100644 --- a/evennia/contrib/menu_login.py +++ b/evennia/contrib/menu_login.py @@ -236,7 +236,7 @@ class CmdPasswordCreate(Command): # to handle tracebacks ourselves at this point. If we don't, we # won't see any errors at all. self.caller.msg("An error occurred. Please e-mail an admin if the problem persists.") - logger.log_errmsg(traceback.format_exc()) + logger.log_trace() # Menu entry 3 - help screen diff --git a/evennia/objects/models.py b/evennia/objects/models.py index eec5c7154b..fc353e50f9 100644 --- a/evennia/objects/models.py +++ b/evennia/objects/models.py @@ -265,8 +265,8 @@ class ObjectDB(TypedObject): except RuntimeError: errmsg = "Error: %s.location = %s creates a location loop." % (self.key, location) - logger.log_errmsg(errmsg) - raise #RuntimeError(errmsg) + logger.log_trace(errmsg) + raise except Exception as e: errmsg = "Error (%s): %s is not a valid location." % (str(e), location) logger.log_trace(errmsg)