dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always load system images; update images only after loading system widgets

Browse Source
This commit is contained in:
ViacheslavKlimov 2023-12-08 13:57:49 +02:00
parent b9ac141bff
commit c6559d6bba
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
View File

@ -271,9 +271,8 @@ public class ThingsboardInstallService {
case "3.6.1": case "3.6.1":
log.info("Upgrading ThingsBoard from version 3.6.1 to 3.6.2 ..."); log.info("Upgrading ThingsBoard from version 3.6.1 to 3.6.2 ...");
databaseEntitiesUpgradeService.upgradeDatabase("3.6.1"); databaseEntitiesUpgradeService.upgradeDatabase("3.6.1");
installScripts.loadSystemImages();
if (!getEnv("SKIP_IMAGES_MIGRATION", false)) { if (!getEnv("SKIP_IMAGES_MIGRATION", false)) {
installScripts.updateImages(); installScripts.setUpdateImages(true);
} else { } else {
log.info("Skipping images migration. Run the upgrade with fromVersion as '3.6.2-images' to migrate"); log.info("Skipping images migration. Run the upgrade with fromVersion as '3.6.2-images' to migrate");
} }
@ -288,6 +287,10 @@ public class ThingsboardInstallService {
dataUpdateService.upgradeRuleNodes(); dataUpdateService.upgradeRuleNodes();
systemDataLoaderService.loadSystemWidgets(); systemDataLoaderService.loadSystemWidgets();
installScripts.loadSystemLwm2mResources(); installScripts.loadSystemLwm2mResources();
installScripts.loadSystemImages();
if (installScripts.isUpdateImages()) {
installScripts.updateImages();
}
} }
log.info("Upgrade finished successfully!"); log.info("Upgrade finished successfully!");

4
application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
View File

@ -16,6 +16,8 @@
package org.thingsboard.server.service.install; package org.thingsboard.server.service.install;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -113,6 +115,8 @@ public class InstallScripts {
@Autowired @Autowired
private ImagesUpdater imagesUpdater; private ImagesUpdater imagesUpdater;
@Getter @Setter
private boolean updateImages = false;
Path getTenantRuleChainsDir() { Path getTenantRuleChainsDir() {
return Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, RULE_CHAINS_DIR); return Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, RULE_CHAINS_DIR);