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

Shut down existing IRC/RSS bots if starting with IRC/RSS_ENABLED=False. Resolves #1238.

Browse source
This commit is contained in:
Griatch 2017-02-27 22:01:08 +01:00
parent effa618268
commit b04a50fe28
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/players/bots.py
View file

@ -13,6 +13,9 @@ from evennia.utils import utils
_IDLE_TIMEOUT = settings.IDLE_TIMEOUT _IDLE_TIMEOUT = settings.IDLE_TIMEOUT
_IRC_ENABLED = settings.IRC_ENABLED
_RSS_ENABLED = settings.RSS_ENABLED
_SESSIONS = None _SESSIONS = None
@ -157,6 +160,12 @@ class IRCBot(Bot):
irc_ssl (bool): Indicates whether to use SSL connection. irc_ssl (bool): Indicates whether to use SSL connection.
""" """
if not _IRC_ENABLED:
# the bot was created, then IRC was turned off. We delete
# ourselves (this will also kill the start script)
self.delete()
return
global _SESSIONS global _SESSIONS
if not _SESSIONS: if not _SESSIONS:
from evennia.server.sessionhandler import SESSIONS as _SESSIONS from evennia.server.sessionhandler import SESSIONS as _SESSIONS
@ -360,6 +369,11 @@ class RSSBot(Bot):
RuntimeError: If `ev_channel` does not exist. RuntimeError: If `ev_channel` does not exist.
""" """
if not _RSS_EMABLED:
# The bot was created, then RSS was turned off. Delete ourselves.
self.delete()
return
global _SESSIONS global _SESSIONS
if not _SESSIONS: if not _SESSIONS:
from evennia.server.sessionhandler import SESSIONS as _SESSIONS from evennia.server.sessionhandler import SESSIONS as _SESSIONS