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

Fixed bug where start command checks if the server was updating would fail everytime.

Browse Source
This commit is contained in:
Andrew McManus 2021-07-26 12:11:46 -04:00
parent 979c67d064
commit 902f7e79bb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/classes/shared/server.py
View File

@ -123,8 +123,8 @@ class Server:
logger.error("Server is already running - Cancelling Startup") logger.error("Server is already running - Cancelling Startup")
console.error("Server is already running - Cancelling Startup") console.error("Server is already running - Cancelling Startup")
return False return False
if self.settings['updating']: if self.check_update():
websocket_helper.broadcast('warn', "Server is updating. Not starting. Please wait for update to finish.") logger.error("Server is updating. Terminating startup.")
return False return False
logger.info("Launching Server {} with command {}".format(self.name, self.server_command)) logger.info("Launching Server {} with command {}".format(self.name, self.server_command))
@ -387,6 +387,13 @@ class Server:
update_thread = threading.Thread(target=self.a_jar_update, daemon=True, name="exe_update") update_thread = threading.Thread(target=self.a_jar_update, daemon=True, name="exe_update")
update_thread.start() update_thread.start()
def check_update(self):
server_stats = db_helper.get_server_stats_by_id(self.server_id)
if server_stats['updating']:
return True
else:
return False
def a_jar_update(self): def a_jar_update(self):
wasStarted = "-1" wasStarted = "-1"
self.backup_server() self.backup_server()