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

Changed lockhandler.add/replace to use LockExceptions instead of log_obj, which should also work more flexibly for handling lock errors for players. Resolves #410.

Browse source
This commit is contained in:
Griatch 2014-04-21 00:24:33 +02:00
parent 9784a2a5c0
commit 3848a789a7
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/locks/lockhandler.py
View file

@ -115,7 +115,8 @@ __all__ = ("LockHandler", "LockException")
#
# Exception class
# Exception class. This will be raised
# by errors in lock definitions.
#
class LockException(Exception):
@ -171,7 +172,6 @@ class LockHandler(object):
_cache_lockfuncs()
self.obj = obj
self.locks = {}
self.log_obj = None
self.reset()
def __str__(self):
@ -179,12 +179,7 @@ class LockHandler(object):
def _log_error(self, message):
"Try to log errors back to object"
if self.log_obj and hasattr(self.log_obj, 'msg'):
self.log_obj.msg(message)
elif hasattr(self.obj, 'msg'):
self.obj.msg(message)
else:
logger.log_errmsg("%s: %s" % (self.obj, message))
raise LockException(message)
def _parse_lockstring(self, storage_lockstring):
"""
@ -240,10 +235,9 @@ class LockHandler(object):
wlist.append(_("Lock: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' " % \
{"access_type":access_type, "source":locks[access_type][2], "goal":raw_lockstring}))
locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring)
if wlist and self.log_obj:
if wlist:
# a warning text was set, it's not an error, so only report
# if log_obj is available.
self._log_error("\n".join(wlist))
logger.log_warn("\n".join(wlist))
if elist:
# an error text was set, raise exception.
raise LockException("\n".join(elist))
@ -269,15 +263,12 @@ class LockHandler(object):
"""
self.lock_bypass = hasattr(obj, "is_superuser") and obj.is_superuser
def add(self, lockstring, log_obj=None):
def add(self, lockstring):
"""
Add a new lockstring on the form '<access_type>:<functions>'. Multiple
access types should be separated by semicolon (;).
If log_obj is given, it will be fed error information.
"""
if log_obj:
self.log_obj = log_obj
# sanity checks
for lockdef in lockstring.split(';'):
if not ':' in lockstring:
@ -302,17 +293,16 @@ class LockHandler(object):
# cache the locks will get rid of eventual doublets
self._cache_locks(storage_lockstring)
self._save_locks()
self.log_obj = None
return True
def replace(self, lockstring, log_obj=None):
def replace(self, lockstring):
"Replaces the lockstring entirely."
old_lockstring = str(self)
self.clear()
try:
return self.add(lockstring, log_obj)
return self.add(lockstring)
except LockException:
self.add(old_lockstring, log_obj)
self.add(old_lockstring)
raise
def get(self, access_type=None):