Since there were calls to the logger before we even knew where to sto…

…re the logfile, we always created an empty undefined log file in the current working directory. (#45) Now we activate the logging on the preloader and activate it explicitly by using the system property. Co-authored-by: Markus <[email protected]>
EXXETA · May 20, 2020 · 95ea923 · 95ea923
1 parent 3494670
commit 95ea923
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 34 deletions.
diff --git a/src/main/java/org/correomqtt/CorreoMqtt.java b/src/main/java/org/correomqtt/CorreoMqtt.java
@@ -1,9 +1,5 @@
 package org.correomqtt;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.util.ContextInitializer;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.util.StatusPrinter;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
@@ -15,11 +11,7 @@
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
 import org.apache.maven.artifact.versioning.ComparableVersion;
-import org.correomqtt.business.dispatcher.ApplicationLifecycleDispatcher;
-import org.correomqtt.business.dispatcher.PreloadingDispatcher;
-import org.correomqtt.business.dispatcher.ShortcutDispatcher;
-import org.correomqtt.business.dispatcher.StartupDispatcher;
-import org.correomqtt.business.dispatcher.StartupObserver;
+import org.correomqtt.business.dispatcher.*;
 import org.correomqtt.business.model.SettingsDTO;
 import org.correomqtt.business.services.ConfigService;
 import org.correomqtt.business.utils.VersionUtils;
@@ -60,10 +52,9 @@ public void init() throws IOException {
         final SettingsDTO settings = ConfigService.getInstance().getSettings();
 
         handleVersionMismatch(settings);
-
         setLocale(settings);
         HostServicesHolder.getInstance().setHostServices(getHostServices());
-        setLoggerFilePath();
+
         PreloadingDispatcher.getInstance().onProgress(resources.getString("preloaderLanguageSet"));
 
         if (settings.isFirstStart()) {
@@ -193,25 +184,6 @@ private void setupShortcut() {
         );
     }
 
-    private void setLoggerFilePath() {
-
-        // Set the path for file logging to user directory.
-        System.setProperty("correomqtt-logfile", ConfigService.getInstance().getLogPath());
-
-        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
-        ContextInitializer ci = new ContextInitializer(lc);
-        lc.reset();
-        try {
-            //I prefer autoConfig() over JoranConfigurator.doConfigure() so I wouldn't need to find the file myself.
-            ci.autoConfig();
-        } catch (JoranException e) {
-            // StatusPrinter will try to log this
-            e.printStackTrace(); //TODO
-        }
-        StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
-    }
-
-
     @Override
     public void onPluginUpdateFailed(String disabledPath) {
         AlertHelper.warn(

diff --git a/src/main/java/org/correomqtt/CorreoPreloader.java b/src/main/java/org/correomqtt/CorreoPreloader.java
@@ -1,5 +1,9 @@
 package org.correomqtt;
 
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.RotateTransition;
@@ -17,6 +21,7 @@
 import org.correomqtt.business.services.ConfigService;
 import org.correomqtt.business.utils.VersionUtils;
 import org.correomqtt.gui.controller.PreloaderViewController;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
@@ -32,6 +37,8 @@ public CorreoPreloader() {
 
     @Override
     public void init() throws IOException {
+        setLoggerFilePath();
+
         ConfigService.getInstance().setCssFileName();
         String cssPath = ConfigService.getInstance().getCssPath();
 
@@ -47,6 +54,24 @@ public void init() throws IOException {
         }
     }
 
+    private void setLoggerFilePath() {
+        // Set the path for file logging to user directory.
+        System.setProperty("correomqtt-logfile", ConfigService.getInstance().getLogPath());
+        System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, CorreoMqtt.class.getResource("logger-config.xml").getPath());
+
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        ContextInitializer ci = new ContextInitializer(lc);
+        lc.reset();
+        try {
+            //I prefer autoConfig() over JoranConfigurator.doConfigure() so I wouldn't need to find the file myself.
+            ci.autoConfig();
+        } catch (JoranException e) {
+            // StatusPrinter will try to log this
+            e.printStackTrace(); //TODO
+        }
+        StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
+    }
+
     @Override
     public void start(Stage primaryStage) throws Exception {
         this.preloaderStage = primaryStage;

diff --git a/src/main/java/org/correomqtt/plugin/manager/PluginSecurityPolicy.java b/src/main/java/org/correomqtt/plugin/manager/PluginSecurityPolicy.java
@@ -1,7 +1,5 @@
 package org.correomqtt.plugin.manager;
 
-import org.slf4j.LoggerFactory;
-
 import java.io.FilePermission;
 import java.lang.reflect.ReflectPermission;
 import java.security.*;
@@ -45,8 +43,6 @@ public static Permissions removeForbiddenPermissions(String pluginName, Permissi
             Permission p = permissionIterator.next();
             if (isPermissionAllowed(p)) {
                 cleanPermissions.add(p);
-            } else {
-                LoggerFactory.getLogger(PluginSecurityPolicy.class).warn("{} tried to add forbidden permission: {}", pluginName, p);
             }
         }
         return cleanPermissions;

diff --git a/src/main/resources/logback.xml → ...esources/org/correomqtt/logger-config.xml b/src/main/resources/logback.xml → ...esources/org/correomqtt/logger-config.xml