diff --git a/evennia/__init__.py b/evennia/__init__.py index 01bbb1ee47..03aaf9e4ec 100644 --- a/evennia/__init__.py +++ b/evennia/__init__.py @@ -54,7 +54,7 @@ create_message = None # utilities lockfuncs = None -tickerhandler = None +oobhandler = None logger = None gametime = None ansi = None @@ -62,6 +62,12 @@ spawn = None managers = None contrib = None +# Handlers +SESSION_HANDLER = None +TICKER_HANDLER = None +OOB_HANDLER = None +CHANNEL_HANDLER = None + import os from subprocess import check_output, CalledProcessError, STDOUT @@ -136,13 +142,18 @@ def init(): # utilities from locks import lockfuncs - from scripts.tickerhandler import TICKER_HANDLER as tickerhandler from utils import logger from utils import gametime from utils import ansi from utils.spawner import spawn import contrib + # handlers + from scripts.tickerhandler import TICKER_HANDLER + from server.oobhandler import OOB_HANDLER + from server.sessionhandler import SESSION_HANDLER + from comms.channelhandler import CHANNEL_HANDLER + # API containers class _EvContainer(object): diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py index ee5f7c9ad5..ad2a026dca 100644 --- a/evennia/comms/channelhandler.py +++ b/evennia/comms/channelhandler.py @@ -158,4 +158,5 @@ class ChannelHandler(object): self.cached_cmdsets[source_object] = chan_cmdset return chan_cmdset -CHANNELHANDLER = ChannelHandler() +CHANNEL_HANDLER = ChannelHandler() +CHANNELHANDLER = CHANNEL_HANDLER # legacy diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py index ac9b8abb7f..5704cc1585 100644 --- a/evennia/server/sessionhandler.py +++ b/evennia/server/sessionhandler.py @@ -445,4 +445,5 @@ class ServerSessionHandler(SessionHandler): # pass the rest off to the session session.data_in(text=text, **kwargs) -SESSIONS = ServerSessionHandler() +SESSION_HANDLER = ServerSessionHandler() +SESSIONS = SESSION_HANDLER # legacy