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

Remove AMP_ENABLED setting since disabling it serves no purpose. Resolve #3409

Browse source
This commit is contained in:
Griatch 2024-01-28 14:22:55 +01:00
parent ccd384b0f3
commit e3fc5666d4
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/server/deprecations.py
View file

@ -112,6 +112,11 @@ def check_errors(settings):
if hasattr(settings, "GAME_DIRECTORY_LISTING"): if hasattr(settings, "GAME_DIRECTORY_LISTING"):
raise DeprecationWarning(game_directory_deprecation) raise DeprecationWarning(game_directory_deprecation)
if hasattr(settings, "AMP_ENABLED"):
raise DeprecationWarning(
"AMP_ENABLED option is no longer supported. Remove it from your settings."
)
chan_connectinfo = settings.CHANNEL_CONNECTINFO chan_connectinfo = settings.CHANNEL_CONNECTINFO
if chan_connectinfo is not None and not isinstance(chan_connectinfo, dict): if chan_connectinfo is not None and not isinstance(chan_connectinfo, dict):
raise DeprecationWarning( raise DeprecationWarning(

5
evennia/server/service.py
View file

@ -152,8 +152,7 @@ class EvenniaServerService(MultiService):
except OperationalError: except OperationalError:
print("Server server_starting_mode couldn't be set - database not set up.") print("Server server_starting_mode couldn't be set - database not set up.")
if settings.AMP_ENABLED: self.register_amp()
self.register_amp()
if settings.WEBSERVER_ENABLED: if settings.WEBSERVER_ENABLED:
self.register_webserver() self.register_webserver()
@ -483,7 +482,7 @@ class EvenniaServerService(MultiService):
# initialize and start global scripts # initialize and start global scripts
evennia.GLOBAL_SCRIPTS.start() evennia.GLOBAL_SCRIPTS.start()
@defer.inlineCallbacks @defer.inlineCallbacks
def shutdown(self, mode="reload", _reactor_stopping=False): def shutdown(self, mode="reload", _reactor_stopping=False):
""" """

1
evennia/settings_default.py
View file

@ -128,7 +128,6 @@ EVENNIA_ADMIN = True
# operating between two processes on the same machine. You usually don't need to # operating between two processes on the same machine. You usually don't need to
# change this unless you cannot use the default AMP port/host for # change this unless you cannot use the default AMP port/host for
# whatever reason. # whatever reason.
AMP_ENABLED = True
AMP_HOST = "localhost" AMP_HOST = "localhost"
AMP_PORT = 4006 AMP_PORT = 4006
AMP_INTERFACE = "127.0.0.1" AMP_INTERFACE = "127.0.0.1"