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

Have lockshandler fail gracefully rather than cause a server crash

Browse source
This commit is contained in:
Tehom 2016-10-05 02:46:43 -04:00 • committed by Griatch
parent ae5848dd0b
commit 3ff9eac86c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/locks/lockhandler.py
View file

@ -177,7 +177,10 @@ class LockHandler(object):
_cache_lockfuncs() _cache_lockfuncs()
self.obj = obj self.obj = obj
self.locks = {} self.locks = {}
try:
self.reset() self.reset()
except LockException as err:
logger.log_trace(err)
def __str__(self): def __str__(self):
return ";".join(self.locks[key][2] for key in sorted(self.locks)) return ";".join(self.locks[key][2] for key in sorted(self.locks))