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

Cleanup of changelog

Browse source
This commit is contained in:
Griatch 2018-09-30 13:06:36 +02:00
parent 5d2e30cf2a
commit fedc08c043
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/evennia_launcher.py
View file

@ -2014,7 +2014,7 @@ def main():
# launch menu for operation
init_game_directory(CURRENT_DIR, check_db=True)
run_menu()
elif option in ('status', 'info', 'start', 'istart', 'ipstart', 'reload', 'reboot',
elif option in ('status', 'info', 'start', 'istart', 'ipstart', 'reload', 'restart', 'reboot',
'reset', 'stop', 'sstop', 'kill', 'skill'):
# operate the server directly
if not SERVER_LOGFILE:
@ -2029,7 +2029,7 @@ def main():
start_server_interactive()
elif option == "ipstart":
start_portal_interactive()
elif option == 'reload':
elif option in ('reload', 'restart'):
reload_evennia(args.profiler)
elif option == 'reboot':
reboot_evennia(args.profiler, args.profiler)

7
evennia/utils/evmenu.py
View file

@ -731,11 +731,14 @@ class EvMenu(object):
Args:
nodename (str or callable): Name of node or a callable
to be called as `function(caller, raw_string)` or `function(caller)`
to return the actual goto string.
to be called as `function(caller, raw_string, **kwargs)` or
`function(caller, **kwargs)` to return the actual goto string or
a ("nodename", kwargs) tuple.
raw_string (str): The raw default string entered on the
previous node (only used if the node accepts it as an
argument)
Kwargs:
any: Extra arguments to goto callables.
"""