Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create universal exit function so exiting code can be in one place.

Browse Source
This commit is contained in:
luukas 2021-04-18 00:24:54 +03:00
parent 736924c839
commit 23ce45724a
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/classes/shared/cmd.py
View File

@ -49,6 +49,9 @@ class MainPrompt(cmd.Cmd, object):
console.critical("Unable to write exit file due to error: {}".format(e)) console.critical("Unable to write exit file due to error: {}".format(e))
def do_exit(self, line): def do_exit(self, line):
self.universal_exit()
def universal_exit(self):
logger.info("Stopping all server daemons / threads") logger.info("Stopping all server daemons / threads")
console.info("Stopping all server daemons / threads - This may take a few seconds") console.info("Stopping all server daemons / threads - This may take a few seconds")
websocket_helper.disconnect_all() websocket_helper.disconnect_all()

8
main.py
View File

@ -141,10 +141,4 @@ if __name__ == '__main__':
logger.info("Recieved SIGINT, stopping Crafty") logger.info("Recieved SIGINT, stopping Crafty")
break break
logger.info("Stopping all server daemons / threads") Crafty.universal_exit()
console.info("Stopping all server daemons / threads - This may take a few seconds")
Crafty._clean_shutdown()
while True:
if tasks_manager.get_main_thread_run_status():
sys.exit(0)
time.sleep(1)