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

Fix /stop /restart issue. /restart does not actually restart the server right now

Browse Source
This commit is contained in:
Andrew 2022-02-11 01:16:45 -05:00
parent 569876e377
commit c263a4a22b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,6 +359,7 @@ class Server:
server_name = self.name server_name = self.name
server_pid = self.process.pid server_pid = self.process.pid
while running: while running:
x = x+1 x = x+1
logstr = f"Server {server_name} is still running - waiting 2s to see if it stops ({int(60-(x*2))} seconds until force close)" logstr = f"Server {server_name} is still running - waiting 2s to see if it stops ({int(60-(x*2))} seconds until force close)"
@ -477,6 +478,13 @@ class Server:
# if all is okay, we just exit out # if all is okay, we just exit out
if running: if running:
return return
#check the exit code -- This could be a fix for /stop
if self.process.returncode == 0:
logger.warning(f'Process {self.process.pid} exited with code {self.process.returncode}. This is considered a clean exit'+
' supressing crash handling.')
# cancel the watcher task
self.server_scheduler.remove_job("c_"+str(self.server_id))
return
servers_helper.sever_crashed(self.server_id) servers_helper.sever_crashed(self.server_id)
# if we haven't tried to restart more 3 or more times # if we haven't tried to restart more 3 or more times