Added captalized names for singleton handlers in the main package api, like TICKER_HANDLER and OOB_HANDLER rather than tickerhandler and oobhandler.
This commit is contained in:
parent
d8286a592e
commit
d97bbb309b
3 changed files with 17 additions and 4 deletions
|
|
@ -54,7 +54,7 @@ create_message = None
|
||||||
|
|
||||||
# utilities
|
# utilities
|
||||||
lockfuncs = None
|
lockfuncs = None
|
||||||
tickerhandler = None
|
oobhandler = None
|
||||||
logger = None
|
logger = None
|
||||||
gametime = None
|
gametime = None
|
||||||
ansi = None
|
ansi = None
|
||||||
|
|
@ -62,6 +62,12 @@ spawn = None
|
||||||
managers = None
|
managers = None
|
||||||
contrib = None
|
contrib = None
|
||||||
|
|
||||||
|
# Handlers
|
||||||
|
SESSION_HANDLER = None
|
||||||
|
TICKER_HANDLER = None
|
||||||
|
OOB_HANDLER = None
|
||||||
|
CHANNEL_HANDLER = None
|
||||||
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from subprocess import check_output, CalledProcessError, STDOUT
|
from subprocess import check_output, CalledProcessError, STDOUT
|
||||||
|
|
@ -136,13 +142,18 @@ def init():
|
||||||
|
|
||||||
# utilities
|
# utilities
|
||||||
from locks import lockfuncs
|
from locks import lockfuncs
|
||||||
from scripts.tickerhandler import TICKER_HANDLER as tickerhandler
|
|
||||||
from utils import logger
|
from utils import logger
|
||||||
from utils import gametime
|
from utils import gametime
|
||||||
from utils import ansi
|
from utils import ansi
|
||||||
from utils.spawner import spawn
|
from utils.spawner import spawn
|
||||||
import contrib
|
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
|
# API containers
|
||||||
|
|
||||||
class _EvContainer(object):
|
class _EvContainer(object):
|
||||||
|
|
|
||||||
|
|
@ -158,4 +158,5 @@ class ChannelHandler(object):
|
||||||
self.cached_cmdsets[source_object] = chan_cmdset
|
self.cached_cmdsets[source_object] = chan_cmdset
|
||||||
return chan_cmdset
|
return chan_cmdset
|
||||||
|
|
||||||
CHANNELHANDLER = ChannelHandler()
|
CHANNEL_HANDLER = ChannelHandler()
|
||||||
|
CHANNELHANDLER = CHANNEL_HANDLER # legacy
|
||||||
|
|
|
||||||
|
|
@ -445,4 +445,5 @@ class ServerSessionHandler(SessionHandler):
|
||||||
# pass the rest off to the session
|
# pass the rest off to the session
|
||||||
session.data_in(text=text, **kwargs)
|
session.data_in(text=text, **kwargs)
|
||||||
|
|
||||||
SESSIONS = ServerSessionHandler()
|
SESSION_HANDLER = ServerSessionHandler()
|
||||||
|
SESSIONS = SESSION_HANDLER # legacy
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue