From 84974775b4ddc85963fa2622512395be8e0eb3ef Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 2 Jan 2024 14:17:21 +0100 Subject: [PATCH] Reduce log spam --- src/main/java/org/qortal/ApplyBootstrap.java | 12 ++++++------ src/main/java/org/qortal/ApplyRestart.java | 10 +++++----- src/main/java/org/qortal/ApplyUpdate.java | 12 ++++++------ .../api/restricted/resource/AdminResource.java | 1 - src/main/java/org/qortal/controller/RestartNode.java | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/qortal/ApplyBootstrap.java b/src/main/java/org/qortal/ApplyBootstrap.java index 547d8558..9b370f7a 100644 --- a/src/main/java/org/qortal/ApplyBootstrap.java +++ b/src/main/java/org/qortal/ApplyBootstrap.java @@ -147,7 +147,7 @@ public class ApplyBootstrap { private static void deleteDB() { // Get the repository path from settings String repositoryPath = Settings.getInstance().getRepositoryPath(); - LOGGER.info(String.format("Repository path: %s", repositoryPath)); + LOGGER.debug(String.format("Repository path: %s", repositoryPath)); try { Path directory = Paths.get(repositoryPath); @@ -165,19 +165,19 @@ public class ApplyBootstrap { } }); } catch (IOException e) { - LOGGER.info("Error deleting DB: {}", e.getMessage()); + LOGGER.error("Error deleting DB: {}", e.getMessage()); } } private static void restartNode(String[] args) { String javaHome = System.getProperty("java.home"); - LOGGER.info(() -> String.format("Java home: %s", javaHome)); + LOGGER.debug(() -> String.format("Java home: %s", javaHome)); Path javaBinary = Paths.get(javaHome, "bin", "java"); - LOGGER.info(() -> String.format("Java binary: %s", javaBinary)); + LOGGER.debug(() -> String.format("Java binary: %s", javaBinary)); Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER); - LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher)); + LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher)); List javaCmd; if (Files.exists(exeLauncher)) { @@ -208,7 +208,7 @@ public class ApplyBootstrap { ProcessBuilder processBuilder = new ProcessBuilder(javaCmd); if (Files.exists(exeLauncher)) { - LOGGER.info(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); + LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE); } diff --git a/src/main/java/org/qortal/ApplyRestart.java b/src/main/java/org/qortal/ApplyRestart.java index 4a7ad473..70d07df5 100644 --- a/src/main/java/org/qortal/ApplyRestart.java +++ b/src/main/java/org/qortal/ApplyRestart.java @@ -140,13 +140,13 @@ public class ApplyRestart { private static void restartNode(String[] args) { String javaHome = System.getProperty("java.home"); - LOGGER.info(() -> String.format("Java home: %s", javaHome)); + LOGGER.debug(() -> String.format("Java home: %s", javaHome)); Path javaBinary = Paths.get(javaHome, "bin", "java"); - LOGGER.info(() -> String.format("Java binary: %s", javaBinary)); + LOGGER.debug(() -> String.format("Java binary: %s", javaBinary)); Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER); - LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher)); + LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher)); List javaCmd; if (Files.exists(exeLauncher)) { @@ -172,12 +172,12 @@ public class ApplyRestart { } try { - LOGGER.info(String.format("Restarting node with: %s", String.join(" ", javaCmd))); + LOGGER.debug(String.format("Restarting node with: %s", String.join(" ", javaCmd))); ProcessBuilder processBuilder = new ProcessBuilder(javaCmd); if (Files.exists(exeLauncher)) { - LOGGER.info(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); + LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE); } diff --git a/src/main/java/org/qortal/ApplyUpdate.java b/src/main/java/org/qortal/ApplyUpdate.java index 768b1854..ba2e0860 100644 --- a/src/main/java/org/qortal/ApplyUpdate.java +++ b/src/main/java/org/qortal/ApplyUpdate.java @@ -139,7 +139,7 @@ public class ApplyUpdate { apiKey.delete(); } catch (IOException e) { - LOGGER.info("Error loading or deleting API key: {}", e.getMessage()); + LOGGER.error("Error loading or deleting API key: {}", e.getMessage()); } } @@ -181,13 +181,13 @@ public class ApplyUpdate { private static void restartNode(String[] args) { String javaHome = System.getProperty("java.home"); - LOGGER.info(() -> String.format("Java home: %s", javaHome)); + LOGGER.debug(() -> String.format("Java home: %s", javaHome)); Path javaBinary = Paths.get(javaHome, "bin", "java"); - LOGGER.info(() -> String.format("Java binary: %s", javaBinary)); + LOGGER.debug(() -> String.format("Java binary: %s", javaBinary)); Path exeLauncher = Paths.get(WINDOWS_EXE_LAUNCHER); - LOGGER.info(() -> String.format("Windows EXE launcher: %s", exeLauncher)); + LOGGER.debug(() -> String.format("Windows EXE launcher: %s", exeLauncher)); List javaCmd; if (Files.exists(exeLauncher)) { @@ -213,12 +213,12 @@ public class ApplyUpdate { } try { - LOGGER.info(String.format("Restarting node with: %s", String.join(" ", javaCmd))); + LOGGER.debug(String.format("Restarting node with: %s", String.join(" ", javaCmd))); ProcessBuilder processBuilder = new ProcessBuilder(javaCmd); if (Files.exists(exeLauncher)) { - LOGGER.info(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); + LOGGER.debug(() -> String.format("Setting env %s to %s", JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE)); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE); } diff --git a/src/main/java/org/qortal/api/restricted/resource/AdminResource.java b/src/main/java/org/qortal/api/restricted/resource/AdminResource.java index 301e6562..837288e5 100644 --- a/src/main/java/org/qortal/api/restricted/resource/AdminResource.java +++ b/src/main/java/org/qortal/api/restricted/resource/AdminResource.java @@ -24,7 +24,6 @@ import org.qortal.api.model.ActivitySummary; import org.qortal.api.model.NodeInfo; import org.qortal.api.model.NodeStatus; import org.qortal.block.BlockChain; -import org.qortal.controller.AutoUpdate; import org.qortal.controller.BootstrapNode; import org.qortal.controller.Controller; import org.qortal.controller.RestartNode; diff --git a/src/main/java/org/qortal/controller/RestartNode.java b/src/main/java/org/qortal/controller/RestartNode.java index 4a64a87f..b8d81b85 100644 --- a/src/main/java/org/qortal/controller/RestartNode.java +++ b/src/main/java/org/qortal/controller/RestartNode.java @@ -75,7 +75,7 @@ public class RestartNode { if (savedArgs != null) javaCmd.addAll(Arrays.asList(savedArgs)); - LOGGER.info(String.format("Restarting node with: %s", String.join(" ", javaCmd))); + LOGGER.debug(String.format("Restarting node with: %s", String.join(" ", javaCmd))); SysTray.getInstance().showMessage(Translator.INSTANCE.translate("SysTray", "RESTARTING_NODE"), Translator.INSTANCE.translate("SysTray", "APPLYING_RESTARTING_NODE"),