crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Reduce log spam

Browse Source
This commit is contained in:
AlphaX-Projects 2024-01-02 14:17:21 +01:00
parent 677fd7a64f
commit 84974775b4
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/ApplyBootstrap.java
View File

@ -147,7 +147,7 @@ public class ApplyBootstrap {
private static void deleteDB() { private static void deleteDB() {
// Get the repository path from settings // Get the repository path from settings
String repositoryPath = Settings.getInstance().getRepositoryPath(); String repositoryPath = Settings.getInstance().getRepositoryPath();
LOGGER.info(String.format("Repository path: %s", repositoryPath)); LOGGER.debug(String.format("Repository path: %s", repositoryPath));
try { try {
Path directory = Paths.get(repositoryPath); Path directory = Paths.get(repositoryPath);
@ -165,19 +165,19 @@ public class ApplyBootstrap {
} }
}); });
} catch (IOException e) { } catch (IOException e) {
LOGGER.info("Error deleting DB: {}", e.getMessage()); LOGGER.error("Error deleting DB: {}", e.getMessage());
} }
} }
private static void restartNode(String[] args) { private static void restartNode(String[] args) {
String javaHome = System.getProperty("java.home"); 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"); 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); 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<String> javaCmd; List<String> javaCmd;
if (Files.exists(exeLauncher)) { if (Files.exists(exeLauncher)) {
@ -208,7 +208,7 @@ public class ApplyBootstrap {
ProcessBuilder processBuilder = new ProcessBuilder(javaCmd); ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
if (Files.exists(exeLauncher)) { 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); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
} }

10
src/main/java/org/qortal/ApplyRestart.java
View File

@ -140,13 +140,13 @@ public class ApplyRestart {
private static void restartNode(String[] args) { private static void restartNode(String[] args) {
String javaHome = System.getProperty("java.home"); 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"); 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); 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<String> javaCmd; List<String> javaCmd;
if (Files.exists(exeLauncher)) { if (Files.exists(exeLauncher)) {
@ -172,12 +172,12 @@ public class ApplyRestart {
} }
try { 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); ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
if (Files.exists(exeLauncher)) { 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); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
} }

12
src/main/java/org/qortal/ApplyUpdate.java
View File

@ -139,7 +139,7 @@ public class ApplyUpdate {
apiKey.delete(); apiKey.delete();
} catch (IOException e) { } 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) { private static void restartNode(String[] args) {
String javaHome = System.getProperty("java.home"); 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"); 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); 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<String> javaCmd; List<String> javaCmd;
if (Files.exists(exeLauncher)) { if (Files.exists(exeLauncher)) {
@ -213,12 +213,12 @@ public class ApplyUpdate {
} }
try { 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); ProcessBuilder processBuilder = new ProcessBuilder(javaCmd);
if (Files.exists(exeLauncher)) { 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); processBuilder.environment().put(JAVA_TOOL_OPTIONS_NAME, JAVA_TOOL_OPTIONS_VALUE);
} }

1
src/main/java/org/qortal/api/restricted/resource/AdminResource.java
View File

@ -24,7 +24,6 @@ import org.qortal.api.model.ActivitySummary;
import org.qortal.api.model.NodeInfo; import org.qortal.api.model.NodeInfo;
import org.qortal.api.model.NodeStatus; import org.qortal.api.model.NodeStatus;
import org.qortal.block.BlockChain; import org.qortal.block.BlockChain;
import org.qortal.controller.AutoUpdate;
import org.qortal.controller.BootstrapNode; import org.qortal.controller.BootstrapNode;
import org.qortal.controller.Controller; import org.qortal.controller.Controller;
import org.qortal.controller.RestartNode; import org.qortal.controller.RestartNode;

2
src/main/java/org/qortal/controller/RestartNode.java
View File

@ -75,7 +75,7 @@ public class RestartNode {
if (savedArgs != null) if (savedArgs != null)
javaCmd.addAll(Arrays.asList(savedArgs)); 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"), SysTray.getInstance().showMessage(Translator.INSTANCE.translate("SysTray", "RESTARTING_NODE"),
Translator.INSTANCE.translate("SysTray", "APPLYING_RESTARTING_NODE"), Translator.INSTANCE.translate("SysTray", "APPLYING_RESTARTING_NODE"),