From 879d87c68bb0cad7e9b994af97e429b54f142a84 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Wed, 26 Aug 2026 15:48:40 +0200 Subject: [PATCH 1/3] fix different pid file format --- .../main/java/com/condation/cms/CMSServer.java | 16 +++------------- .../cms/cli/commands/host/ReloadHost.java | 8 ++------ .../cms/cli/commands/repo/Checkout.java | 8 ++------ 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/cms-server/src/main/java/com/condation/cms/CMSServer.java b/cms-server/src/main/java/com/condation/cms/CMSServer.java index d71991b91..a41c619fb 100644 --- a/cms-server/src/main/java/com/condation/cms/CMSServer.java +++ b/cms-server/src/main/java/com/condation/cms/CMSServer.java @@ -25,6 +25,7 @@ import com.condation.cms.api.Constants; import com.condation.cms.api.utils.ServerUtil; +import com.condation.cms.cli.tools.CLIServerUtils; import java.io.IOException; import java.nio.file.Files; @@ -39,19 +40,8 @@ @Slf4j public class CMSServer { - public static boolean isRunning () { - var pidFile = ServerUtil.getPath(Constants.PID_FILE); - if (!Files.exists(pidFile)) { - return false; - } - try { - var pid = Files.readString(pidFile); - - return ProcessHandle.of(Long.parseLong(pid)).isPresent(); - } catch (IOException ex) { - log.error("", ex); - } - return false; + public static boolean isRunning () throws IOException { + return CLIServerUtils.getCMSProcess().isPresent(); } public static Semver getVersion () { diff --git a/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java b/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java index 8cf691110..b1998e2ba 100644 --- a/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java +++ b/cms-server/src/main/java/com/condation/cms/cli/commands/host/ReloadHost.java @@ -26,6 +26,7 @@ import com.condation.cms.api.Constants; import com.condation.cms.api.ServerProperties; import com.condation.cms.api.utils.ServerUtil; +import com.condation.cms.cli.tools.CLIServerUtils; import com.condation.cms.core.configuration.ConfigurationFactory; import com.condation.cms.core.configuration.properties.ExtendedServerProperties; import com.condation.cms.ipc.Command; @@ -84,12 +85,7 @@ public void run() { } private static Optional getCMSProcess () throws Exception { - var pidFile = ServerUtil.getPath(Constants.PID_FILE); - if (!Files.exists(pidFile)) { - return Optional.empty(); - } - var pid = Files.readString(pidFile); - return ProcessHandle.of(Long.parseLong(pid.trim())); + return CLIServerUtils.getCMSProcess(); } diff --git a/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java b/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java index bbe20248b..ce1077345 100644 --- a/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java +++ b/cms-server/src/main/java/com/condation/cms/cli/commands/repo/Checkout.java @@ -26,6 +26,7 @@ import com.condation.cms.api.Constants; import com.condation.cms.api.ServerProperties; import com.condation.cms.api.utils.ServerUtil; +import com.condation.cms.cli.tools.CLIServerUtils; import com.condation.cms.core.configuration.ConfigurationFactory; import com.condation.cms.core.configuration.properties.ExtendedServerProperties; import com.condation.cms.ipc.Command; @@ -84,12 +85,7 @@ public void run() { } private static Optional getCMSProcess () throws Exception { - var pidFile = ServerUtil.getPath(Constants.PID_FILE); - if (!Files.exists(pidFile)) { - return Optional.empty(); - } - var pid = Files.readString(pidFile); - return ProcessHandle.of(Long.parseLong(pid.trim())); + return CLIServerUtils.getCMSProcess(); } From 6e1d9b6b074be019cf8a4046e5a286a165624393 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Wed, 26 Aug 2026 20:07:51 +0200 Subject: [PATCH 2/3] handling exception --- cms-server/src/main/java/com/condation/cms/CMSServer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cms-server/src/main/java/com/condation/cms/CMSServer.java b/cms-server/src/main/java/com/condation/cms/CMSServer.java index a41c619fb..377aff021 100644 --- a/cms-server/src/main/java/com/condation/cms/CMSServer.java +++ b/cms-server/src/main/java/com/condation/cms/CMSServer.java @@ -40,8 +40,12 @@ @Slf4j public class CMSServer { - public static boolean isRunning () throws IOException { - return CLIServerUtils.getCMSProcess().isPresent(); + public static boolean isRunning () { + try { + return CLIServerUtils.getCMSProcess().isPresent(); + } catch (IOException ioe) { + throw new RuntimeException(ioe); + } } public static Semver getVersion () { From 7f5d72d667125a505af9111dfce90b976d7f78f9 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Wed, 26 Aug 2026 20:13:07 +0200 Subject: [PATCH 3/3] fix sonar issues --- cms-server/src/main/java/com/condation/cms/CMSServer.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cms-server/src/main/java/com/condation/cms/CMSServer.java b/cms-server/src/main/java/com/condation/cms/CMSServer.java index 377aff021..34d0e8a73 100644 --- a/cms-server/src/main/java/com/condation/cms/CMSServer.java +++ b/cms-server/src/main/java/com/condation/cms/CMSServer.java @@ -23,12 +23,8 @@ -import com.condation.cms.api.Constants; -import com.condation.cms.api.utils.ServerUtil; import com.condation.cms.cli.tools.CLIServerUtils; - import java.io.IOException; -import java.nio.file.Files; import java.util.Properties; import lombok.extern.slf4j.Slf4j; import org.semver4j.Semver;