Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions cms-server/src/main/java/com/condation/cms/CMSServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +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;
Expand All @@ -40,18 +37,11 @@
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;
try {
return CLIServerUtils.getCMSProcess().isPresent();
} catch (IOException ioe) {
throw new RuntimeException(ioe);
}
}

public static Semver getVersion () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -84,12 +85,7 @@ public void run() {
}

private static Optional<ProcessHandle> 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();
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -84,12 +85,7 @@ public void run() {
}

private static Optional<ProcessHandle> 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();
}


Expand Down
Loading