1 = low (only show unexpected errors)
+2 = medium (show all encountered exceptions, log main tasks and show time taken)
+3 = high (log all tasks and time taken)
+Default: 1
*/ + public int debugLevel() { + return config.getInt("debug-level", 1); + } + + /** Reloads the config from file, or creates a new file with default values if there is none. + Also reads the value for debug-level and passes it on to MyLogger. */ public boolean reloadConfig() { try { if (!configFile.exists()) { saveDefaultConfig(); } config = YamlConfiguration.loadConfiguration(configFile); + MyLogger.setDebugLevel(debugLevel()); return true; } catch (Exception e) { diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/enums/DebugLevel.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/enums/DebugLevel.java new file mode 100644 index 0000000..3969097 --- /dev/null +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/enums/DebugLevel.java @@ -0,0 +1,5 @@ +package com.gmail.artemis.the.gr8.playerstats.enums; + +public enum DebugLevel { + LOW, MEDIUM, HIGH +} diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/listeners/JoinListener.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/listeners/JoinListener.java index 1dd19bc..e6dfd6b 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/listeners/JoinListener.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/listeners/JoinListener.java @@ -16,7 +16,7 @@ public class JoinListener implements Listener { @EventHandler public void onPlayerJoin(PlayerJoinEvent joinEvent) { if (!joinEvent.getPlayer().hasPlayedBefore()) { - threadManager.startReloadThread(null, false); + threadManager.startReloadThread(null); } } } diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/reload/ReloadAction.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/reload/ReloadAction.java index 1088fa5..8b3af9b 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/reload/ReloadAction.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/reload/ReloadAction.java @@ -1,5 +1,6 @@ package com.gmail.artemis.the.gr8.playerstats.reload; +import com.gmail.artemis.the.gr8.playerstats.utils.MyLogger; import com.gmail.artemis.the.gr8.playerstats.utils.UnixTimeHandler; import org.bukkit.OfflinePlayer; @@ -15,40 +16,33 @@ public class ReloadAction extends RecursiveAction { private final int start; private final int end; - private final boolean whitelistOnly; - private final boolean excludeBanned; private final int lastPlayedLimit; private final ConcurrentHashMap1 = low (only show unexpected errors)
+2 = medium (show all encountered exceptions, log main tasks and show time taken)
+3 = high (log all tasks and time taken)
+Default: 1
*/ + public static void setDebugLevel(int level) { + if (level == 2) { + debugLevel = DebugLevel.MEDIUM; + } + else if (level == 3) { + debugLevel = DebugLevel.HIGH; + } + else { + debugLevel = DebugLevel.LOW; + } + } + + /** Output to console that the given thread has been created (but not started yet).*/ + public static void threadCreated(String threadName) { + if (debugLevel != DebugLevel.LOW) { + logger.info(threadName + " created!"); + } + } + + /** Output to console that the given thread has been started. */ + public static void threadStart(String threadName) { + if (debugLevel == DebugLevel.MEDIUM || debugLevel == DebugLevel.HIGH) { + logger.info(threadName + " started!"); + } + } + + /** Output to console that another reloadThread is already running. */ + public static void threadAlreadyRunning(String threadName) { + logger.info("Another reloadThread is already running! (" + threadName + ")"); + } + + /** Output to console that the executingThread is waiting for otherThread to finish up. */ + public static void waitingForOtherThread(String executingThread, String otherThread) { + logger.info(executingThread + ": Waiting for " + otherThread + " to finish up..."); + } + + /** If DebugLevel is MEDIUM or HIGH, output to console that an action has started. + @param taskLength Length of the action (in terms of units-to-process)*/ + public static void actionCreated(int taskLength) { + if (debugLevel != DebugLevel.LOW) { + threadNames = new ConcurrentHashMap<>(); + playersIndex.set(0); + logger.info("Initial Action created for " + taskLength + " Players. Start Index is " + playersIndex.get() + ". Processing..."); + } + } + + /** Internally save the name of the executing thread for later logging of this action. + The list of names is reset upon the start of every new action. + @param threadName Name of the executing thread*/ + public static void subActionCreated(String threadName) { + if (debugLevel == DebugLevel.HIGH) { + if (!threadNames.containsKey(threadName)) { + threadNames.put(threadName, threadNames.size()); + } + } + } + + /** Internally save the name of the executing thread and processed player for logging, + and for the ReloadThread, if DebugLevel is HIGH, output the last 10 processed players once + there have been 10 names saved in MyLogger. This method is synchronized. + @param threadName Name of the executing thread + @param playerName Name of the player that was processed in this action + @param thread 1 for ReloadThread, 2 for StatThread */ + public static synchronized void actionRunning(String threadName, String playerName, int thread) { + if (debugLevel != DebugLevel.LOW) { + if (!threadNames.containsKey(threadName)) { + threadNames.put(threadName, threadNames.size()); + } + if (thread == 1 && debugLevel == DebugLevel.HIGH) { + if (incrementOfTen()) { + logger.info(Arrays.asList(processedPlayers).toString()); + } + processedPlayers[nextPlayersIndex() % 10] = playerName; + } + else if (debugLevel == DebugLevel.MEDIUM) { + nextPlayersIndex(); + } + } + } + + /** Output to console that an action has finished. +For the ReloadThread, if DebugLevel is HIGH, output the left-over processed players. + For both threads, if DebugLevel is MEDIUM or HIGH, output the names of the threads that were used.
+ @param thread 1 for ReloadThread, 2 for StatThread */ + public static void actionFinished(int thread) { + if (thread == 1 && debugLevel == DebugLevel.HIGH) { + ArrayList