Remove dependence on .restart file, add reboot option to launcher

This commit is contained in:
Griatch 2018-01-20 12:41:27 +01:00
parent 9dfd1f5ea8
commit d6105f6d6c
7 changed files with 173 additions and 131 deletions

View file

@ -85,8 +85,9 @@ INFO_DICT = {"servername": SERVERNAME, "version": VERSION, "errors": "", "info":
# -------------------------------------------------------------
# Portal Service object
# -------------------------------------------------------------
class Portal(object):
"""
@ -113,13 +114,12 @@ class Portal(object):
self.sessions.portal = self
self.process_id = os.getpid()
self.server_process_id = None
self.server_restart_mode = "shutdown"
# set a callback if the server is killed abruptly,
# by Ctrl-C, reboot etc.
reactor.addSystemEventTrigger('before', 'shutdown', self.shutdown, _reactor_stopping=True)
self.game_running = False
def get_info_dict(self):
"Return the Portal info, for display."
return INFO_DICT