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

Added functionality to @services command. Allowed @reload to also accept a reason argument.

Browse source
This commit is contained in:
Griatch 2013-03-08 23:09:21 +01:00
parent d4b0afca83
commit 0f2762d5f2
1 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/commands/default/system.py
View file

@ -35,7 +35,7 @@ class CmdReload(MuxCommand):
Reload the system Reload the system
Usage: Usage:
@reload @reload [reason]
This restarts the server. The Portal is not This restarts the server. The Portal is not
affected. Non-persistent scripts will survive a @reload (use affected. Non-persistent scripts will survive a @reload (use
@ -49,7 +49,10 @@ class CmdReload(MuxCommand):
""" """
Reload the system. Reload the system.
""" """
SESSIONS.announce_all(" Server restarting ...") reason = ""
if self.args:
reason = "(Reason: %s) " % self.args.rstrip(".")
SESSIONS.announce_all(" Server restarting %s..." % reason)
SESSIONS.server.shutdown(mode='reload') SESSIONS.server.shutdown(mode='reload')
class CmdReset(MuxCommand): class CmdReset(MuxCommand):
@ -94,7 +97,8 @@ class CmdShutdown(MuxCommand):
def func(self): def func(self):
"Define function" "Define function"
try: try:
session = self.caller.sessions[0] # Only allow shutdown if caller has session
self.caller.sessions[0]
except Exception: except Exception:
return return
self.caller.msg('Shutting down server ...') self.caller.msg('Shutting down server ...')
@ -417,12 +421,14 @@ class CmdService(MuxCommand):
Switches: Switches:
list - shows all available services (default) list - shows all available services (default)
start - activates a service start - activates or reactivate a service
stop - stops a service stop - stops/inactivate a service (can often be restarted)
delete - tries to permanently remove a service
Service management system. Allows for the listing, Service management system. Allows for the listing,
starting, and stopping of services. If no switches starting, and stopping of services. If no switches
are given, services will be listed. are given, services will be listed. Note that to operate on the
service you have to supply the full (green or red) name as given in the list.
""" """
key = "@service" key = "@service"
@ -436,8 +442,8 @@ class CmdService(MuxCommand):
caller = self.caller caller = self.caller
switches = self.switches switches = self.switches
if switches and switches[0] not in ["list", "start", "stop"]: if switches and switches[0] not in ("list", "start", "stop", "delete"):
caller.msg("Usage: @service/<start|stop|list> [service]") caller.msg("Usage: @service/<list|start|stop|delete> [servicename]")
return return
# get all services # get all services
@ -450,7 +456,7 @@ class CmdService(MuxCommand):
# Just display the list of installed services and their # Just display the list of installed services and their
# status, then exit. # status, then exit.
string = "-" * 78 string = "-" * 78
string += "\n{wServices{n (use @services/start|stop):" string += "\n{wServices{n (use @services/start|stop|delete):"
for service in service_collection.services: for service in service_collection.services:
if service.running: if service.running:
@ -469,26 +475,35 @@ class CmdService(MuxCommand):
service = service_collection.getServiceNamed(self.args) service = service_collection.getServiceNamed(self.args)
except Exception: except Exception:
string = 'Invalid service name. This command is case-sensitive. ' string = 'Invalid service name. This command is case-sensitive. '
string += 'See @service/list for valid services.' string += 'See @service/list for valid service name (enter the full name exactly).'
caller.msg(string) caller.msg(string)
return return
if switches[0] == "stop": if switches[0] in ("stop", "delete"):
# Stopping a service gracefully closes it and disconnects # Stopping/killing a service gracefully closes it and disconnects
# any connections (if applicable). # any connections (if applicable).
delmode = switches[0] == "delete"
if not service.running: if not service.running:
caller.msg('That service is not currently running.') caller.msg('That service is not currently running.')
return return
if service.name[:7] == 'Evennia': if service.name[:7] == 'Evennia':
string = "You seem to be shutting down a core Evennia* service. Note that" if delmode:
string += "Stopping some TCP port services will *not* disconnect users *already*" caller.msg("You cannot remove a core Evennia service (named 'Evennia***').")
return
string = "You seem to be shutting down a core Evennia service (named 'Evennia***'). Note that"
string += "stopping some TCP port services will *not* disconnect users *already*"
string += "connected on those ports, but *may* instead cause spurious errors for them. To " string += "connected on those ports, but *may* instead cause spurious errors for them. To "
string += "safely and permanently remove ports, change settings file and restart the server." string += "safely and permanently remove ports, change settings file and restart the server."
caller.msg(string) caller.msg(string)
service.stopService() if delmode:
caller.msg("Stopping service '%s'." % self.args) service.stopService()
service_collection.removeService(service)
caller.msg("Stopped and removed service '%s'." % self.args)
else:
service.stopService()
caller.msg("Stopped service '%s'." % self.args)
return return
if switches[0] == "start": if switches[0] == "start":