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

Key errors are fixed in this

Browse Source
This commit is contained in:
Andrew
2021-08-11 23:49:06 -04:00
parent 6cc87c6dd1
commit 0875734777
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,7 @@ class Server:
logger.info("Backup Thread started for server {}.".format(self.settings['server_name'])) logger.info("Backup Thread started for server {}.".format(self.settings['server_name']))
def a_backup_server(self): def a_backup_server(self):
if not self.is_backingup:
logger.info("Starting server {} (ID {}) backup".format(self.name, self.server_id)) logger.info("Starting server {} (ID {}) backup".format(self.name, self.server_id))
self.is_backingup = True self.is_backingup = True
conf = db_helper.get_backup_config(self.server_id) conf = db_helper.get_backup_config(self.server_id)
@ -382,6 +383,8 @@ class Server:
logger.exception("Failed to create backup of server {} (ID {})".format(self.name, self.server_id)) logger.exception("Failed to create backup of server {} (ID {})".format(self.name, self.server_id))
self.is_backingup = False self.is_backingup = False
return return
else:
logger.error("Server {} is already backing up. Please wait for backup to finish.".format(self.server_id))
def list_backups(self): def list_backups(self):
conf = db_helper.get_backup_config(self.server_id) conf = db_helper.get_backup_config(self.server_id)
@ -449,14 +452,7 @@ class Server:
#boolean returns true for false for success #boolean returns true for false for success
downloaded = helper.download_file(self.settings['executable_update_url'], current_executable) downloaded = helper.download_file(self.settings['executable_update_url'], current_executable)
if not downloaded: while db_helper.get_server_stats_by_id(self.server_id)['updating']:
time.sleep(5)
db_helper.set_update(self.server_id, False)
websocket_helper.broadcast('notification',
"Executable update failed for " + self.name + ". Check log file for details.")
logger.error("Executable download failed.")
while db_helper.get_server_data_by_id(self.server_id)['updating']:
if downloaded and not self.is_backingup: if downloaded and not self.is_backingup:
logger.info("Executable updated successfully. Starting Server") logger.info("Executable updated successfully. Starting Server")
@ -477,4 +473,10 @@ class Server:
db_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip']) db_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip'])
if wasStarted: if wasStarted:
self.start_server() self.start_server()
elif not downloaded and not self.is_backingup:
time.sleep(5)
db_helper.set_update(self.server_id, False)
websocket_helper.broadcast('notification',
"Executable update failed for " + self.name + ". Check log file for details.")
logger.error("Executable download failed.")
pass pass