100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
PersistenceService now automatically sets SETUP_WIPE_CLEAN_INSTALL=true when no existing DB migration detected
Rich Turnereb755dcb5b82
diff --git a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java b/container/src/main/java/org/openremote/container/persistence/PersistenceService.javaindex a1f75cee6..4641014b3 100644--- a/container/src/main/java/org/openremote/container/persistence/PersistenceService.java+++ b/container/src/main/java/org/openremote/container/persistence/PersistenceService.java@@ -72,7 +72,7 @@ public class PersistenceService implements ContainerService {public static final int DATABASE_MAX_POOL_SIZE_DEFAULT = 20;public static final String DATABASE_CONNECTION_TIMEOUT_SECONDS = "DATABASE_CONNECTION_TIMEOUT_SECONDS";public static final int DATABASE_CONNECTION_TIMEOUT_SECONDS_DEFAULT = 5;- public static final int PRIORITY = Integer.MIN_VALUE + 10;+ public static final int PRIORITY = Integer.MIN_VALUE + 100;protected MessageBrokerService messageBrokerService;protected Database database;@@ -225,6 +225,13 @@ public class PersistenceService implements ContainerService {.baselineOnMigrate(true).load();+ MigrationInfo currentMigration = flyway.info().current();++ if (currentMigration == null && !forceClean) {+ LOG.warning("DB is empty so changing forceClean to true");+ forceClean = true;+ }+if (forceClean) {LOG.warning("!!! Cleaning database !!!");flyway.clean();diff --git a/manager/src/main/java/org/openremote/manager/setup/SetupService.java b/manager/src/main/java/org/openremote/manager/setup/SetupService.javaindex cefc8bc7b..444689d67 100644--- a/manager/src/main/java/org/openremote/manager/setup/SetupService.java+++ b/manager/src/main/java/org/openremote/manager/setup/SetupService.java@@ -53,7 +53,7 @@ public class SetupService implements ContainerService {@Overridepublic int getPriority() {- return IdentityService.PRIORITY + 10; // Start just after identity service+ return PersistenceService.PRIORITY + 10; // Start just after persistence service}@Override