Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-28 10:37:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restructed terminal output from Server and Portal to allow external plugin-services to cleanly add their info at startup.

Browse source
This commit is contained in:
Griatch 2012-09-22 23:18:29 +02:00
parent a30029472b
commit d535d77811
2 changed files with 37 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/server/server.py
View file

@ -88,8 +88,6 @@ class Evennia(object):
self.sessions = SESSIONS
self.sessions.server = self
print '\n' + '-'*50
# Database-specific startup optimizations.
self.sqlite3_prep()
@ -101,11 +99,6 @@ class Evennia(object):
# initialize channelhandler
channelhandler.CHANNELHANDLER.update()
# Make info output to the terminal.
self.terminal_output()
print '-'*50
# set a callback if the server is killed abruptly,
# by Ctrl-C, reboot etc.
reactor.addSystemEventTrigger('before', 'shutdown', self.shutdown, _reactor_stopping=True)
@ -207,13 +200,6 @@ class Evennia(object):
if SERVER_STARTSTOP_MODULE:
SERVER_STARTSTOP_MODULE.at_server_start()
def terminal_output(self):
"""
Outputs server startup info to the terminal.
"""
print ' %(servername)s Server (%(version)s) started.' % {'servername': SERVERNAME, 'version': VERSION}
print ' amp (to Portal): %s' % AMP_PORT
def set_restart_mode(self, mode=None):
"""
This manages the flag file that tells the runner if the server is
@ -311,12 +297,17 @@ application = service.Application('Evennia')
# and is where we store all the other services.
EVENNIA = Evennia(application)
# The AMP protocol handles the communication between
# the portal and the mud server. Only reason to ever deactivate
# it would be during testing and debugging.
print '-' * 50
print ' %(servername)s Server (%(version)s) started.' % {'servername': SERVERNAME, 'version': VERSION}
if AMP_ENABLED:
# The AMP protocol handles the communication between
# the portal and the mud server. Only reason to ever deactivate
# it would be during testing and debugging.
print ' amp (to Portal): %s' % AMP_PORT
from src.server import amp
factory = amp.AmpServerFactory(EVENNIA)
@ -328,6 +319,8 @@ if IRC_ENABLED:
# IRC channel connections
print ' irc enabled'
from src.comms import irc
irc.connect_all()
@ -335,12 +328,17 @@ if IMC2_ENABLED:
# IMC2 channel connections
print ' imc2 enabled'
from src.comms import imc2
imc2.connect_all()
if RSS_ENABLED:
# RSS feed channel connections
print ' rss enabled'
from src.comms import rss
rss.connect_all()
@ -348,6 +346,8 @@ for plugin_module in SERVER_SERVICES_PLUGIN_MODULES:
# external plugin protocols
plugin_module.start_plugin_services(EVENNIA)
print '-' * 50 # end of terminal output
# clear server startup mode
ServerConfig.objects.conf("server_starting_mode", delete=True)