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

Make sure delayed import actually imports

Browse source
This commit is contained in:
Griatch 2022-10-31 21:39:43 +01:00
parent 353e4c0aa7
commit b1f027bf57
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/server/server.py
View file

@ -98,18 +98,17 @@ except ImportError:
"copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf." "copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf."
) )
# Maintenance function - this is called repeatedly by the server # Maintenance function - this is called repeatedly by the server
_IDMAPPER_CACHE_MAXSIZE = settings.IDMAPPER_CACHE_MAXSIZE
_IDLE_TIMEOUT = settings.IDLE_TIMEOUT
_LAST_SERVER_TIME_SNAPSHOT = 0
_MAINTENANCE_COUNT = 0 _MAINTENANCE_COUNT = 0
_FLUSH_CACHE = None _FLUSH_CACHE = None
_IDMAPPER_CACHE_MAXSIZE = settings.IDMAPPER_CACHE_MAXSIZE
_GAMETIME_MODULE = None _GAMETIME_MODULE = None
_DEFAULTOBJECT = None _DEFAULTOBJECT = None
_IDLE_TIMEOUT = settings.IDLE_TIMEOUT
_LAST_SERVER_TIME_SNAPSHOT = 0
def _server_maintenance(): def _server_maintenance():
""" """
@ -120,9 +119,11 @@ def _server_maintenance():
global _LAST_SERVER_TIME_SNAPSHOT global _LAST_SERVER_TIME_SNAPSHOT
global _OBJECTDB global _OBJECTDB
if not _MAINTENANCE_COUNT: if not _OBJECTDB:
from evennia.objects.models import ObjectDB as _OBJECTDB from evennia.objects.models import ObjectDB as _OBJECTDB
if not _GAMETIME_MODULE:
from evennia.utils import gametime as _GAMETIME_MODULE from evennia.utils import gametime as _GAMETIME_MODULE
if not _FLUSH_CACHE:
from evennia.utils.idmapper.models import conditional_flush as _FLUSH_CACHE from evennia.utils.idmapper.models import conditional_flush as _FLUSH_CACHE
_MAINTENANCE_COUNT += 1 _MAINTENANCE_COUNT += 1