From b7872f2d6f9e6665e0c7ae4cb5f0fecd61af91fb Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 14 May 2015 21:20:31 +0200 Subject: [PATCH] Changed the order of Portal/Server shutdown to make sure the Portal stops correctly in light of the changes to the shutdown protocol from previous revision. --- evennia/commands/default/system.py | 2 +- evennia/server/server.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index a7ab43ff4b..ef3adda200 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -118,8 +118,8 @@ class CmdShutdown(MuxCommand): announcement += "%s\n" % self.args logger.log_infomsg('Server shutdown by %s.' % self.caller.name) SESSIONS.announce_all(announcement) - SESSIONS.portal_shutdown() SESSIONS.server.shutdown(mode='shutdown') + SESSIONS.portal_shutdown() class CmdPy(MuxCommand): diff --git a/evennia/server/server.py b/evennia/server/server.py index 6f8c713d46..2702f20ab4 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -355,7 +355,6 @@ class Evennia(object): from evennia.server.oobhandler import OOB_HANDLER OOB_HANDLER.save() else: - ServerConfig.objects.conf("server_restart_mode", "reset") if mode == 'reset': # like shutdown but don't unset the is_connected flag and don't disconnect sessions yield [o.at_server_shutdown() for o in ObjectDB.get_all_cached_instances()] @@ -368,6 +367,7 @@ class Evennia(object): for p in PlayerDB.get_all_cached_instances()] yield ObjectDB.objects.clear_all_sessids() yield [(s.pause(), s.at_server_reload()) for s in ScriptDB.get_all_cached_instances()] + ServerConfig.objects.conf("server_restart_mode", "reset") self.at_server_cold_stop() # tickerhandler state should always be saved.