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

Make scripts/objects lists use EvMore. Change EvMore to not justify by default.

Browse source
This commit is contained in:
Griatch 2020-01-11 15:49:12 +01:00
parent b5aee2c41e
commit 69d85bd184
221 changed files with 2190 additions and 6810 deletions
Download patch file Download diff file Expand all files Collapse all files

23
evennia/scripts/monitorhandler.py
View file

@ -53,9 +53,7 @@ class MonitorHandler(object):
fieldname
].items():
path = "%s.%s" % (callback.__module__, callback.__name__)
savedata.append(
(obj, fieldname, idstring, path, persistent, kwargs)
)
savedata.append((obj, fieldname, idstring, path, persistent, kwargs))
savedata = dbserialize(savedata)
ServerConfig.objects.conf(key=self.savekey, value=savedata)
@ -74,14 +72,7 @@ class MonitorHandler(object):
restored_monitors = ServerConfig.objects.conf(key=self.savekey)
if restored_monitors:
restored_monitors = dbunserialize(restored_monitors)
for (
obj,
fieldname,
idstring,
path,
persistent,
kwargs,
) in restored_monitors:
for (obj, fieldname, idstring, path, persistent, kwargs) in restored_monitors:
try:
if not server_reload and not persistent:
# this monitor will not be restarted
@ -94,11 +85,7 @@ class MonitorHandler(object):
callback = variable_from_module(modname, varname)
if obj and hasattr(obj, fieldname):
self.monitors[obj][fieldname][idstring] = (
callback,
persistent,
kwargs,
)
self.monitors[obj][fieldname][idstring] = (callback, persistent, kwargs)
except Exception:
continue
# make sure to clean data from database
@ -111,9 +98,7 @@ class MonitorHandler(object):
"""
to_delete = []
if obj in self.monitors and fieldname in self.monitors[obj]:
for idstring, (callback, persistent, kwargs) in self.monitors[obj][
fieldname
].items():
for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
try:
callback(obj=obj, fieldname=fieldname, **kwargs)
except Exception: