From b4749f8cafa9085fd3ad1b73c0d6c7505e16b675 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 23 Jun 2022 19:34:27 -0400 Subject: [PATCH] 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: