From bfd6ece47c61b6c6946d2a77cad4bba69fd00a62 Mon Sep 17 00:00:00 2001 From: henddher Date: Sun, 3 Oct 2021 18:05:03 -0500 Subject: [PATCH 1/2] Addition of BROADCAST_SERVER_RESTART_MESSAGES flag to notify all sessions that the server is restarting. --- evennia/commands/default/system.py | 4 +++- evennia/server/sessionhandler.py | 4 +++- evennia/settings_default.py | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index 28f63614a3..c439fe4eaa 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -26,6 +26,7 @@ from evennia.scripts.taskhandler import TaskHandlerTask COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS) _TASK_HANDLER = None +_BROADCAST_SERVER_RESTART_MESSAGES = settings.BROADCAST_SERVER_RESTART_MESSAGES # delayed imports _RESOURCE = None @@ -69,7 +70,8 @@ class CmdReload(COMMAND_DEFAULT_CLASS): reason = "" if self.args: reason = "(Reason: %s) " % self.args.rstrip(".") - SESSIONS.announce_all(" Server restart initiated %s..." % reason) + if _BROADCAST_SERVER_RESTART_MESSAGES: + SESSIONS.announce_all(" Server restart initiated %s..." % reason) SESSIONS.portal_restart_server() diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py index 5af23a932e..7277f0f602 100644 --- a/evennia/server/sessionhandler.py +++ b/evennia/server/sessionhandler.py @@ -31,6 +31,7 @@ from codecs import decode as codecs_decode from django.utils.translation import gettext as _ _FUNCPARSER_PARSE_OUTGOING_MESSAGES_ENABLED = settings.FUNCPARSER_PARSE_OUTGOING_MESSAGES_ENABLED +_BROADCAST_SERVER_RESTART_MESSAGES = settings.BROADCAST_SERVER_RESTART_MESSAGES # delayed imports _AccountDB = None @@ -397,7 +398,8 @@ class ServerSessionHandler(SessionHandler): # tell the server hook we synced self.server.at_post_portal_sync(mode) # announce the reconnection - self.announce_all(_(" ... Server restarted.")) + if _BROADCAST_SERVER_RESTART_MESSAGES: + self.announce_all(_(" ... Server restarted.")) def portal_disconnect(self, session): """ diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 479178b10b..3c37b3f2e0 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -244,6 +244,8 @@ MAX_CHAR_LIMIT_WARNING = ( # debugging. OBS: Showing full tracebacks to regular users could be a # security problem -turn this off in a production game! IN_GAME_ERRORS = True +# Broadcast "Server restart"-like messages to all sessions. +BROADCAST_SERVER_RESTART_MESSAGES = True ###################################################################### # Evennia Database config From 42feb07a0866d9e0f18942605420c54641c82143 Mon Sep 17 00:00:00 2001 From: henddher Date: Sun, 3 Oct 2021 18:51:16 -0500 Subject: [PATCH 2/2] Add missing dependency scipy. Contrib xyzroom needs it. --- requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.txt b/requirements.txt index d8a4df3b12..8580fb7593 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,3 +26,6 @@ parameterized==0.8.1 # windows-specific pypiwin32;platform_system=="Windows" + +# xyzroom contrib +scipy==1.7.1