[Fix] Fix Sponge and Velocity logging error

AuroraLS3 · Oct 13, 2018 · 747a1f4 · 747a1f4
1 parent 90c885c
commit 747a1f4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/SpongePlugin.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/SpongePlugin.java
@@ -71,7 +71,7 @@ public SpongePlugin(CombineDebugLogger debugLogger) {
         this.debugLogger = debugLogger;
         this.runnableFactory = new SpongeRunnableFactory(this);
         this.timings = new Timings(debugLogger);
-        this.logger = new Slf4jPluginLogger(getLogger(), this::getDebugLogger);
+        this.logger = new Slf4jPluginLogger(this::getLogger, this::getDebugLogger);
         this.errorHandler = new DefaultErrorHandler(this, logger, new File(getDataFolder(), "logs"));
     }
 

diff --git a/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/VelocityPlugin.java b/AbstractPluginFramework/src/main/java/com/djrapitops/plugin/VelocityPlugin.java
@@ -58,7 +58,7 @@ public VelocityPlugin(CombineDebugLogger debugLogger) {
         this.debugLogger = debugLogger;
         this.runnableFactory = new VelocityRunnableFactory(this, getProxy().getScheduler());
         this.timings = new Timings(debugLogger);
-        this.logger = new Slf4jPluginLogger(getLogger(), this::getDebugLogger);
+        this.logger = new Slf4jPluginLogger(this::getLogger, this::getDebugLogger);
         this.errorHandler = new DefaultErrorHandler(this, logger, new File(getDataFolder(), "logs"));
     }
 

diff --git a/...luginFramework/src/main/java/com/djrapitops/plugin/logging/console/Slf4jPluginLogger.java b/...luginFramework/src/main/java/com/djrapitops/plugin/logging/console/Slf4jPluginLogger.java
@@ -14,17 +14,27 @@
 public class Slf4jPluginLogger implements PluginLogger {
 
     private final Supplier<DebugLogger> debugLogger;
-    private final Logger logger;
+    private final Supplier<Logger> loggerSupplier;
 
     /**
      * Create a new Slf4jPluginLogger.
      *
-     * @param logger      slf4j logger for console logging.
-     * @param debugLogger Supplier for the {@link DebugLogger} to use.
+     * @param loggerSupplier slf4j logger for console logging.
+     * @param debugLogger    Supplier for the {@link DebugLogger} to use.
      */
-    public Slf4jPluginLogger(Logger logger, Supplier<DebugLogger> debugLogger) {
+    public Slf4jPluginLogger(Logger loggerSupplier, Supplier<DebugLogger> debugLogger) {
+        this(() -> loggerSupplier, debugLogger);
+    }
+
+    /**
+     * Create a new Slf4jPluginLogger
+     *
+     * @param loggerSupplier slf4j logger for console logging.
+     * @param debugLogger    Supplier for the {@link DebugLogger} to use.
+     */
+    public Slf4jPluginLogger(Supplier<Logger> loggerSupplier, Supplier<DebugLogger> debugLogger) {
         this.debugLogger = debugLogger;
-        this.logger = logger;
+        this.loggerSupplier = loggerSupplier;
     }
 
     @Override
@@ -35,6 +45,7 @@ public void log(L level, String... message) {
         } else if (level != L.DEBUG_INFO) {
             log(L.DEBUG, message);
         }
+        Logger logger = loggerSupplier.get();
         switch (level) {
             case CRITICAL:
             case ERROR:
@@ -64,6 +75,7 @@ public void log(L level, String... message) {
 
     @Override
     public void log(L level, String message, Throwable throwable) {
+        Logger logger = loggerSupplier.get();
         switch (level) {
             case CRITICAL:
             case ERROR: