Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-23 00:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an issue with quell not correctly updating its caches in some situations.

Browse source
This commit is contained in:
Griatch 2013-11-11 21:51:41 +01:00
parent ead595c2df
commit ebdc6cdbd4
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/locks/lockhandler.py
View file

@ -168,9 +168,7 @@ class LockHandler(object):
self.obj = obj
self.locks = {}
self.log_obj = None
self.reset_flag = False
self._cache_locks(self.obj.lock_storage)
self.cache_lock_bypass(obj)
self.reset()
def __str__(self):
return ";".join(self.locks[key][2] for key in sorted(self.locks))
@ -332,7 +330,8 @@ class LockHandler(object):
Set the reset flag, so the the lock will be re-cached at next checking.
This is usually set by @reload.
"""
self.reset_flag = True
self._cache_locks(self.obj.lock_storage)
self.cache_lock_bypass(self.obj)
def check(self, accessing_obj, access_type, default=False, no_superuser_bypass=False):
"""
@ -362,12 +361,6 @@ class LockHandler(object):
functions (as defined by your settings) are executed.
"""
if self.reset_flag:
# rebuild cache, either directly or next call
self._cache_locks(self.obj.lock_storage)
self.reset_flag = False
self.cache_lock_bypass(self.obj)
try:
# check if the lock should be bypassed (e.g. superuser status)
if accessing_obj.locks.lock_bypass and not no_superuser_bypass: