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

Make sure at_server_reload is called from non-repeating scripts. Resolve #3139.

Browse source
This commit is contained in:
Griatch 2023-08-06 16:32:52 +02:00
parent 22a20c9094
commit c113cabeba
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/server/server.py
View file

@ -27,22 +27,17 @@ import evennia
evennia._init() evennia._init()
from evennia.server.sessionhandler import SESSIONS
from django.conf import settings from django.conf import settings
from django.db import connection from django.db import connection
from django.db.utils import OperationalError from django.db.utils import OperationalError
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from evennia.accounts.models import AccountDB from evennia.accounts.models import AccountDB
from evennia.scripts.models import ScriptDB from evennia.scripts.models import ScriptDB
from evennia.server.models import ServerConfig from evennia.server.models import ServerConfig
from evennia.server.sessionhandler import SESSIONS
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import get_evennia_version, make_iter, mod_import from evennia.utils.utils import get_evennia_version, make_iter, mod_import
_SA = object.__setattr__ _SA = object.__setattr__
# a file with a flag telling the server to restart after shutdown or not. # a file with a flag telling the server to restart after shutdown or not.
@ -490,9 +485,9 @@ class Evennia:
yield [o.at_server_reload() for o in ObjectDB.get_all_cached_instances()] yield [o.at_server_reload() for o in ObjectDB.get_all_cached_instances()]
yield [p.at_server_reload() for p in AccountDB.get_all_cached_instances()] yield [p.at_server_reload() for p in AccountDB.get_all_cached_instances()]
yield [ yield [
(s._pause_task(auto_pause=True), s.at_server_reload()) (s._pause_task(auto_pause=True) if s.is_active else None, s.at_server_reload())
for s in ScriptDB.get_all_cached_instances() for s in ScriptDB.get_all_cached_instances()
if s.id and s.is_active if s.id
] ]
yield self.sessions.all_sessions_portal_sync() yield self.sessions.all_sessions_portal_sync()
self.at_server_reload_stop() self.at_server_reload_stop()
@ -705,7 +700,6 @@ if "--nodaemon" not in sys.argv and "test" not in sys.argv:
EVENNIA = Evennia(application) EVENNIA = Evennia(application)
if AMP_ENABLED: if AMP_ENABLED:
# The AMP protocol handles the communication between # The AMP protocol handles the communication between
# the portal and the mud server. Only reason to ever deactivate # the portal and the mud server. Only reason to ever deactivate
# it would be during testing and debugging. # it would be during testing and debugging.
@ -724,7 +718,6 @@ if AMP_ENABLED:
EVENNIA.services.addService(amp_service) EVENNIA.services.addService(amp_service)
if WEBSERVER_ENABLED: if WEBSERVER_ENABLED:
# Start a django-compatible webserver. # Start a django-compatible webserver.
from evennia.server.webserver import ( from evennia.server.webserver import (