From 88fd62371803349eda6ff26849d054157762934d Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 17 Jan 2019 10:37:54 +0200 Subject: [PATCH] Memory debug logging now based on config setting --- .../plan/system/settings/ConfigSystem.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java index 42f063dc0..5d10049cd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/settings/ConfigSystem.java @@ -75,7 +75,9 @@ public abstract class ConfigSystem implements SubSystem { copyDefaults(); config.save(); - setDebugMode(); + if (logger.getDebugLogger() instanceof CombineDebugLogger) { + setDebugMode(); + } } catch (IOException e) { throw new EnableException("Failed to save default config.", e); } @@ -83,20 +85,21 @@ public abstract class ConfigSystem implements SubSystem { } private void setDebugMode() { + CombineDebugLogger debugLogger = (CombineDebugLogger) logger.getDebugLogger(); + String debugMode = config.get(PluginSettings.DEBUG); List loggers = new ArrayList<>(); - if (Verify.equalsOne(debugMode, "true", "both", "console")) { + if (Verify.containsOne(debugMode, "true", "both", "all", "console")) { loggers.add(new ConsoleDebugLogger(logger)); } - if (Verify.equalsOne(debugMode, "true", "both", "file")) { + if (Verify.containsOne(debugMode, "true", "both", "all", "file")) { loggers.add(new FolderTimeStampFileDebugLogger(files.getLogsFolder(), () -> errorHandler)); } - if (logger.getDebugLogger() instanceof CombineDebugLogger) { - CombineDebugLogger debugLogger = (CombineDebugLogger) logger.getDebugLogger(); + if (Verify.containsOne(debugMode, "true", "both", "all", "memory")) { loggers.add(debugLogger.getDebugLogger(MemoryDebugLogger.class).orElse(new MemoryDebugLogger())); - debugLogger.setDebugLoggers(loggers.toArray(new DebugLogger[0])); } + debugLogger.setDebugLoggers(loggers.toArray(new DebugLogger[0])); } /**