tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix typo in upgrade logs (#2757) 

* update psql & timescale update

* fix windows upgrade

* fix typo in logging
pull/2762/head
ShvaykaD 6 years ago
committed by GitHub
parent
45af758f46
commit
b9bc280d57
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java
  2. 8
      application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java

8
application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java
View File

@ -102,17 +102,17 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe
Path pathToTempTsKvFile; Path pathToTempTsKvFile;
Path pathToTempTsKvLatestFile; Path pathToTempTsKvLatestFile;
if (SystemUtils.IS_OS_WINDOWS) { if (SystemUtils.IS_OS_WINDOWS) {
log.info("Lookup for environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR + " ..."); log.info("Lookup for environment variable: {} ...", THINGSBOARD_WINDOWS_UPGRADE_DIR);
Path pathToDir; Path pathToDir;
String thingsboardWindowsUpgradeDir = System.getenv("THINGSBOARD_WINDOWS_UPGRADE_DIR"); String thingsboardWindowsUpgradeDir = System.getenv("THINGSBOARD_WINDOWS_UPGRADE_DIR");
if (StringUtils.isNotEmpty(thingsboardWindowsUpgradeDir)) { if (StringUtils.isNotEmpty(thingsboardWindowsUpgradeDir)) {
log.info("Environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR + " found!"); log.info("Environment variable: {} was found!", THINGSBOARD_WINDOWS_UPGRADE_DIR);
pathToDir = Paths.get(thingsboardWindowsUpgradeDir); pathToDir = Paths.get(thingsboardWindowsUpgradeDir);
} else { } else {
log.info("Failed to lookup environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR); log.info("Failed to lookup environment variable: {}", THINGSBOARD_WINDOWS_UPGRADE_DIR);
pathToDir = Paths.get(PATH_TO_USERS_PUBLIC_FOLDER); pathToDir = Paths.get(PATH_TO_USERS_PUBLIC_FOLDER);
} }
log.info("Directory: " + pathToDir + " will be used for creation temporary upgrade files!"); log.info("Directory: {} will be used for creation temporary upgrade files!", pathToDir);
try { try {
Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql"); Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql");
Path tsKvLatestFile = Files.createTempFile(pathToDir, "ts_kv_latest", ".sql"); Path tsKvLatestFile = Files.createTempFile(pathToDir, "ts_kv_latest", ".sql");

8
application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java
View File

@ -99,16 +99,16 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
Path pathToTempTsKvFile; Path pathToTempTsKvFile;
if (SystemUtils.IS_OS_WINDOWS) { if (SystemUtils.IS_OS_WINDOWS) {
Path pathToDir; Path pathToDir;
log.info("Lookup for environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR + " ..."); log.info("Lookup for environment variable: {} ...", THINGSBOARD_WINDOWS_UPGRADE_DIR);
String thingsboardWindowsUpgradeDir = System.getenv(THINGSBOARD_WINDOWS_UPGRADE_DIR); String thingsboardWindowsUpgradeDir = System.getenv(THINGSBOARD_WINDOWS_UPGRADE_DIR);
if (StringUtils.isNotEmpty(thingsboardWindowsUpgradeDir)) { if (StringUtils.isNotEmpty(thingsboardWindowsUpgradeDir)) {
log.info("Environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR + " found!"); log.info("Environment variable: {} was found!", THINGSBOARD_WINDOWS_UPGRADE_DIR);
pathToDir = Paths.get(thingsboardWindowsUpgradeDir); pathToDir = Paths.get(thingsboardWindowsUpgradeDir);
} else { } else {
log.info("Failed to lookup environment variable: " + THINGSBOARD_WINDOWS_UPGRADE_DIR); log.info("Failed to lookup environment variable: {}", THINGSBOARD_WINDOWS_UPGRADE_DIR);
pathToDir = Paths.get(PATH_TO_USERS_PUBLIC_FOLDER); pathToDir = Paths.get(PATH_TO_USERS_PUBLIC_FOLDER);
} }
log.info("Directory: " + pathToDir + " will be used for creation temporary upgrade file!"); log.info("Directory: {} will be used for creation temporary upgrade file!", pathToDir);
try { try {
Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql"); Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql");
pathToTempTsKvFile = tsKvFile.toAbsolutePath(); pathToTempTsKvFile = tsKvFile.toAbsolutePath();

Write Preview
Loading…
Cancel
Save