From b4749f8cafa9085fd3ad1b73c0d6c7505e16b675 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 23 Jun 2022 19:34:27 -0400 Subject: [PATCH 1/3] Fix 2 bugs: Stats startup after backup Server java version path bug --- app/classes/shared/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 07317ff2..1d8906d1 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -242,7 +242,7 @@ class ServerInstance: "Replacing with full java path." ) # Checks for Oracle Java. Only Oracle Java's helper will cause a re-exec. - if "/Oracle/Java/" in str(shutil.which("java")): + if "/Oracle/Java/" in str(self.helper.wtol_path(shutil.which("java"))): logger.info( "Oracle Java detected. Changing start command to avoid re-exec." ) @@ -938,7 +938,7 @@ class ServerInstance: logger.info( "Backup complete. User had shutdown preference. Starting server." ) - self.start_server(HelperUsers.get_user_id_by_name("system")) + self.run_threaded_server(HelperUsers.get_user_id_by_name("system")) time.sleep(3) self.last_backup_failed = False except: From 118924eeaa59585144b18d341caaeb10e74cba5d Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 23 Jun 2022 21:57:50 -0400 Subject: [PATCH 2/3] Fix one more stop where this as an issue --- app/classes/shared/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 1d8906d1..d1ae524c 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -958,7 +958,7 @@ class ServerInstance: logger.info( "Backup complete. User had shutdown preference. Starting server." ) - self.start_server(HelperUsers.get_user_id_by_name("system")) + self.run_threaded_server(HelperUsers.get_user_id_by_name("system")) self.last_backup_failed = True def backup_status(self, source_path, dest_path): From 509e51ebf37210bacf995c2c8c2e771bc9b2bf33 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Fri, 24 Jun 2022 03:39:49 +0100 Subject: [PATCH 3/3] Update changelog !386 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a98e68c..9a6b3565 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ None ### Bug fixes - Fix cannot delete backup on page 2 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/382)) +- Fix server starting up without stats monitoring after backup shutdown. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/386)) +- Fix pathing issue when launching with just "java" ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/386)) ### Tweaks - Rework server list on status page display for use on small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/383)) - Add clone server confirmation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/384))