Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup some logger functions which were missed in the merge conflict.

Browse source
This commit is contained in:
Ahmed Charles 2015-10-19 22:51:36 +00:00
parent c7e1a6a086
commit 3188f89e47
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/commands/default/unloggedin.py
View file

@ -141,7 +141,7 @@ class CmdUnconnectedConnect(MuxCommand):
# to handle tracebacks ourselves at this point. If we don't, # to handle tracebacks ourselves at this point. If we don't,
# we won't see any errors at all. # we won't see any errors at all.
session.msg("An error occurred. Please e-mail an admin if the problem persists.") session.msg("An error occurred. Please e-mail an admin if the problem persists.")
logger.log_errmsg(traceback.format_exc()) logger.log_trace()
finally: finally:
return return
@ -287,7 +287,7 @@ class CmdUnconnectedCreate(MuxCommand):
# to handle tracebacks ourselves at this point. If we don't, # to handle tracebacks ourselves at this point. If we don't,
# we won't see any errors at all. # we won't see any errors at all.
session.msg("An error occurred. Please e-mail an admin if the problem persists.") 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): class CmdUnconnectedQuit(MuxCommand):

2
evennia/contrib/email_login.py
View file

@ -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, # to handle tracebacks ourselves at this point. If we don't,
# we won't see any errors at all. # we won't see any errors at all.
session.msg("An error occurred. Please e-mail an admin if the problem persists.") 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): class CmdUnconnectedQuit(MuxCommand):
""" """

2
evennia/contrib/menu_login.py
View file

@ -236,7 +236,7 @@ class CmdPasswordCreate(Command):
# to handle tracebacks ourselves at this point. If we don't, we # to handle tracebacks ourselves at this point. If we don't, we
# won't see any errors at all. # won't see any errors at all.
self.caller.msg("An error occurred. Please e-mail an admin if the problem persists.") 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 # Menu entry 3 - help screen

4
evennia/objects/models.py
View file

@ -265,8 +265,8 @@ class ObjectDB(TypedObject):
except RuntimeError: except RuntimeError:
errmsg = "Error: %s.location = %s creates a location loop." % (self.key, location) errmsg = "Error: %s.location = %s creates a location loop." % (self.key, location)
logger.log_errmsg(errmsg) logger.log_trace(errmsg)
raise #RuntimeError(errmsg) raise
except Exception as e: except Exception as e:
errmsg = "Error (%s): %s is not a valid location." % (str(e), location) errmsg = "Error (%s): %s is not a valid location." % (str(e), location)
logger.log_trace(errmsg) logger.log_trace(errmsg)