The Unified and Autonomous Development Platform
Fix the bug that GitPlex upgrading fails if using HSQLDB and previous version is running
robin shine25cf117e8673
diff --git a/commons.bootstrap/src/main/java/com/gitplex/commons/bootstrap/Bootstrap.java b/commons.bootstrap/src/main/java/com/gitplex/commons/bootstrap/Bootstrap.javaindex 160c0f9fa1..21ac46b00d 100644--- a/commons.bootstrap/src/main/java/com/gitplex/commons/bootstrap/Bootstrap.java+++ b/commons.bootstrap/src/main/java/com/gitplex/commons/bootstrap/Bootstrap.java@@ -318,11 +318,11 @@ public class Bootstrap {return new File(installDir, "status");}- public static boolean isServerRunning() {+ public static boolean isServerRunning(File installDir) {// status directory may contain multiple pid files, for instance,// appname.pid, appname_backup.pid, etc. We only check for appname.pid// here and assumes that appname does not contain underscore- for (File file: getStatusDir().listFiles()) {+ for (File file: new File(installDir, "status").listFiles()) {if (file.getName().endsWith(".pid") && !file.getName().contains("_"))return true;}diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.javaindex ee64be3aad..4c7682e2e0 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultApplyDBConstraintsCommand.java@@ -38,7 +38,7 @@ public class DefaultApplyDBConstraintsCommand extends DefaultPersistManager {@Overridepublic void start() {- if (Bootstrap.isServerRunning()) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before applying db constraints");System.exit(1);}diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.javaindex 0158204026..6098de0c37 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultBackupCommand.java@@ -51,7 +51,7 @@ public class DefaultBackupCommand extends DefaultPersistManager {System.exit(1);}- if (Bootstrap.isServerRunning() && getDialect().toLowerCase().contains("hsql")) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {logger.error("Please stop server before backing up database");System.exit(1);}diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.javaindex 26cad6e87e..85c834b592 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCheckDataVersionCommand.java@@ -8,7 +8,10 @@ import javax.inject.Singleton;import org.hibernate.Interceptor;import org.hibernate.SessionFactory;import org.hibernate.boot.model.naming.PhysicalNamingStrategy;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.gitplex.commons.bootstrap.Bootstrap;import com.gitplex.commons.hibernate.DefaultPersistManager;import com.gitplex.commons.hibernate.EntityValidator;import com.gitplex.commons.hibernate.HibernateProperties;@@ -20,6 +23,8 @@ import com.gitplex.commons.hibernate.migration.Migrator;@Singletonpublic class DefaultCheckDataVersionCommand extends DefaultPersistManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultCheckDataVersionCommand.class);+@Injectpublic DefaultCheckDataVersionCommand(Set<ModelProvider> modelProviders, PhysicalNamingStrategy physicalNamingStrategy,HibernateProperties properties, Migrator migrator, Interceptor interceptor,@@ -29,6 +34,11 @@ public class DefaultCheckDataVersionCommand extends DefaultPersistManager {@Overridepublic void start() {+ if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {+ logger.error("Please stop server before checking data version");+ System.exit(1);+ }+// Use system.out in case logger is suppressed by user as this output is important to// upgrade procedureSystem.out.println("Data version: " + checkDataVersion(false));diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.javaindex d6939b275c..e40bff6be2 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultCleanCommand.java@@ -35,7 +35,7 @@ public class DefaultCleanCommand extends DefaultPersistManager {@Overridepublic void start() {- if (Bootstrap.isServerRunning()) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before cleaning database");System.exit(1);}diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.javaindex d39b88008d..257254ae80 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultRestoreCommand.java@@ -53,7 +53,7 @@ public class DefaultRestoreCommand extends DefaultPersistManager {logger.info("Restoring database from {}...", backupFile.getAbsolutePath());- if (Bootstrap.isServerRunning()) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before restoring");System.exit(1);}diff --git a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.javaindex 8ea4071532..0aada5b8cd 100644--- a/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java+++ b/commons.hibernate/src/main/java/com/gitplex/commons/hibernate/command/DefaultUpgradeCommand.java@@ -86,11 +86,11 @@ public class DefaultUpgradeCommand extends DefaultPersistManager {System.exit(1);}- if (new File(upgradeDir, "status/server_running").exists()) {+ if (Bootstrap.isServerRunning(upgradeDir)) {logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());System.exit(1);}- if (Bootstrap.isServerRunning()) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());System.exit(1);}diff --git a/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.javaindex c1590cdb36..fb8bf8b09e 100644--- a/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java+++ b/server.core/src/main/java/com/gitplex/server/core/ResetAdminPasswordCommand.java@@ -45,7 +45,7 @@ public class ResetAdminPasswordCommand extends DefaultPersistManager {logger.error("Missing password parameter. Usage: {} <new password>", Bootstrap.command.getScript());System.exit(1);}- if (Bootstrap.isServerRunning()) {+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before resetting admin password");System.exit(1);}