From b9bc280d57d9a9b84be964fd56aa6f652f23b59d Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Mon, 11 May 2020 11:47:17 +0300 Subject: [PATCH] Fix typo in upgrade logs (#2757) * update psql & timescale update * fix windows upgrade * fix typo in logging --- .../service/install/PsqlTsDatabaseUpgradeService.java | 8 ++++---- .../install/TimescaleTsDatabaseUpgradeService.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java index c88af741c8..bca71fc539 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/PsqlTsDatabaseUpgradeService.java @@ -102,17 +102,17 @@ public class PsqlTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgradeSe Path pathToTempTsKvFile; Path pathToTempTsKvLatestFile; 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; String thingsboardWindowsUpgradeDir = System.getenv("THINGSBOARD_WINDOWS_UPGRADE_DIR"); 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); } 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); } - 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 { Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql"); Path tsKvLatestFile = Files.createTempFile(pathToDir, "ts_kv_latest", ".sql"); diff --git a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java index e6e24464aa..a7f243d7b5 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java @@ -99,16 +99,16 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr Path pathToTempTsKvFile; if (SystemUtils.IS_OS_WINDOWS) { 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); 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); } 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); } - 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 { Path tsKvFile = Files.createTempFile(pathToDir, "ts_kv", ".sql"); pathToTempTsKvFile = tsKvFile.toAbsolutePath();