From 4483f35d0f4a6554022b5c58c87723f568487ff1 Mon Sep 17 00:00:00 2001 From: RonanCraft Date: Tue, 11 Apr 2023 17:58:06 -0400 Subject: [PATCH] logger disable-able --- pom.xml | 2 +- .../BetterRTP/references/RTPLogger.java | 17 +++++++++++------ .../references/rtpinfo/QueueHandler.java | 1 + src/main/resources/config.yml | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 7255aeb..e887d19 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ me.SuperRonanCraft BetterRTP jar - 3.6.6 + 3.6.7 1.8 diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/RTPLogger.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/RTPLogger.java index 58e2e07..c4d7ae0 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/RTPLogger.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/RTPLogger.java @@ -19,17 +19,22 @@ public class RTPLogger { //private ConsoleHandler consoleHandler_rtp, consoleHandler_logger; public void setup(BetterRTP plugin) { - this.format = plugin.getFiles().getType(FileOther.FILETYPE.CONFIG).getString("Settings.Logger.Format"); - boolean toConsole = plugin.getFiles().getType(FileOther.FILETYPE.CONFIG).getBoolean("Settings.Logger.LogToConsole"); + FileOther.FILETYPE config = plugin.getFiles().getType(FileOther.FILETYPE.CONFIG); + boolean enabled = config.getBoolean("Settings.Logger.Enabled"); + Logger logger = plugin.getLogger(); + logger.setUseParentHandlers(true); + if (handler != null) { + logger.removeHandler(handler); + handler.close(); + } + if (!enabled) return; + this.format = config.getString("Settings.Logger.Format"); + boolean toConsole = config.getBoolean("Settings.Logger.LogToConsole"); try { - if (handler != null) { - handler.close(); - } this.file = new File(plugin.getDataFolder() + File.separator + "log.txt"); Files.deleteIfExists(file.toPath()); this.handler = new FileHandler(file.getPath(), true); handler.setFormatter(new MyFormatter()); - Logger logger = plugin.getLogger(); logger.setUseParentHandlers(toConsole); //Disable logging to console logger.addHandler(handler); //Log copying diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java index 270940d..f284c9d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueHandler.java @@ -79,6 +79,7 @@ public class QueueHandler implements Listener { //Randomly queues up some safe l } public static void remove(Location loc) { + if (!BetterRTP.getInstance().getSettings().isQueueEnabled()) return; Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), () -> { //Delete all queue data async if (DatabaseHandler.getQueue().removeLocation(loc)) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 60c51ec..3c5734e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -58,7 +58,8 @@ Settings: Enabled: true #Allows betterrtp to automatically queue up safe rtp locations prior to players executing `/rtp` DisableUpdater: false Logger: - LogToConsole: false + Enabled: true #Log all things rtp related to the log.log file + LogToConsole: true Format: 'yyyy-MM-dd HH:mm:ss' Default: