From f49c64e89d5819096b28fdfddaa1e434d61aee24 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Mon, 17 Nov 2014 11:36:27 +0100
Subject: [PATCH] Move StaticLogFile to NCPCommons, make use of the
 useBukkitLogger flag.

---
 .../nocheatplus/logging/StaticLogFile.java          | 13 ++++++++++---
 .../neatmonster/nocheatplus/logging/StaticLog.java  |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)
 rename {NCPCore => NCPCommons}/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java (88%)

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java b/NCPCommons/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java
similarity index 88%
rename from NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java
rename to NCPCommons/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java
index a3e681e6..2440201f 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java
+++ b/NCPCommons/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLogFile.java
@@ -64,6 +64,7 @@ public class StaticLogFile {
             return builder.toString();
         }
     }
+    
     /** The file logger. */
     public static Logger			fileLogger = null;
     /** The file handler. */
@@ -79,13 +80,19 @@ public class StaticLogFile {
         logger.removeHandler(fileHandler);
         fileHandler = null;
     }
+    
+    /**
+     * @throws RuntimeException wrapping actual exceptions (crate directories, file handlers).
+     * @param logFile
+     */
     public static void setupLogger(File logFile){
         // Setup the file logger.
         final Logger logger = Logger.getAnonymousLogger();
         logger.setLevel(Level.INFO);
         logger.setUseParentHandlers(false);
-        for (final Handler h : logger.getHandlers())
+        for (final Handler h : logger.getHandlers()) {
             logger.removeHandler(h);
+        }
         if (fileHandler != null) {
             fileHandler.close();
             logger.removeHandler(fileHandler);
@@ -95,14 +102,14 @@ public class StaticLogFile {
             try {
                 logFile.getParentFile().mkdirs();
             } catch (final Exception e) {
-                StaticLog.logSevere(e);
+                throw new RuntimeException(e); // TODO
             }
             fileHandler = new FileHandler(logFile.getCanonicalPath(), true);
             fileHandler.setLevel(Level.ALL);
             fileHandler.setFormatter(StaticLogFile.LogFileFormatter.newInstance());
             logger.addHandler(fileHandler);
         } catch (final Exception e) {
-            StaticLog.logSevere(e);
+            throw new RuntimeException(e); // TODO
         }
         fileLogger = logger;
     }
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLog.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLog.java
index 77ed94d5..3dc9a5b1 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLog.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/logging/StaticLog.java
@@ -114,6 +114,9 @@ public class StaticLog {
      * @return
      */
     public static boolean scheduleLog(final Level level, final String message) {
+        if (!useBukkitLogger) {
+            return false;
+        }
         try {
             return Bukkit.getScheduler().scheduleSyncDelayedTask(Bukkit.getPluginManager().getPlugin("NoCheatPlus"), new Runnable() {
                 @Override