Remove configruation of LogLevel

plugin/platform-bukkit/src/main/java/fr/xephi/authme/AuthMe.java

@@ -29,8 +29,8 @@ import fr.xephi.authme.listener.PlayerListenerHigherThan18;
 import fr.xephi.authme.listener.PurgeListener;
 import fr.xephi.authme.listener.ServerListener;
 import fr.xephi.authme.logger.ConsoleLogger;
-import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.logger.ConsoleLoggerFactory;
+import fr.xephi.authme.mail.EmailService;
 import fr.xephi.authme.security.crypts.Sha256;
 import fr.xephi.authme.service.BackupService;
 import fr.xephi.authme.service.BukkitService;
@@ -163,9 +163,9 @@ public class AuthMe extends JavaPlugin {
 
         // Check server version
         if (!isClassLoaded("org.spigotmc.event.player.PlayerSpawnLocationEvent")
-            || !isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) {
+                || !isClassLoaded("org.bukkit.event.player.PlayerInteractAtEntityEvent")) {
             logger.warning("You are running an unsupported server version (" + getServerNameVersionSafe() + "). "
-                + "AuthMe requires Spigot 1.8.X or later!");
+                    + "AuthMe requires Spigot 1.8.X or later!");
             stopOrUnload();
             return;
         }
@@ -173,7 +173,7 @@ public class AuthMe extends JavaPlugin {
         // Prevent running AuthMeBridge due to major exploit issues
         if (getServer().getPluginManager().isPluginEnabled("AuthMeBridge")) {
             logger.warning("Detected AuthMeBridge, support for it has been dropped as it was "
-                + "causing exploit issues, please use AuthMeBungee instead! Aborting!");
+                    + "causing exploit issues, please use AuthMeBungee instead! Aborting!");
             stopOrUnload();
             return;
         }
@@ -188,7 +188,7 @@ public class AuthMe extends JavaPlugin {
                 th.printStackTrace();
             } else {
                 logger.logException("File '" + yamlParseException.getFile() + "' contains invalid YAML. "
-                    + "Please run its contents through http://yamllint.com", yamlParseException);
+                        + "Please run its contents through http://yamllint.com", yamlParseException);
             }
             stopOrUnload();
             return;
@@ -206,11 +206,11 @@ public class AuthMe extends JavaPlugin {
         OnStartupTasks.sendMetrics(this, settings);
         if (settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
             logger.info("\n" + "    ___         __  __    __  ___   \n" +
-                "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
+                    "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
-                "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
+                    "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
-                " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
+                    " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
-                "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
+                    "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
-                "                                    ");
+                    "                                    ");
         }
         //detect server brand with classloader
         checkServerType();
@@ -256,8 +256,8 @@ public class AuthMe extends JavaPlugin {
 
         // Create injector, provide elements from the Bukkit environment and register providers
         injector = new InjectorBuilder()
-            .addDefaultHandlers("fr.xephi.authme")
+                .addDefaultHandlers("fr.xephi.authme")
-            .create();
+                .create();
         injector.register(AuthMe.class, this);
         injector.register(Server.class, getServer());
         injector.register(PluginManager.class, getServer().getPluginManager());
@@ -267,7 +267,7 @@ public class AuthMe extends JavaPlugin {
 
         // Get settings and set up logger
         settings = injector.getSingleton(Settings.class);
-        ConsoleLoggerFactory.reloadSettings(settings);
+        ConsoleLogger.initialize();
         OnStartupTasks.setupConsoleFilter(getLogger());
 
         // Set all service fields on the AuthMe class
@@ -385,15 +385,15 @@ public class AuthMe extends JavaPlugin {
     public void onDisable() {
         // onDisable is also called when we prematurely abort, so any field may be null
         OnShutdownPlayerSaver onShutdownPlayerSaver = injector == null
-            ? null
+                ? null
-            : injector.createIfHasDependencies(OnShutdownPlayerSaver.class);
+                : injector.createIfHasDependencies(OnShutdownPlayerSaver.class);
         if (onShutdownPlayerSaver != null) {
             onShutdownPlayerSaver.saveAllPlayers();
         }
         if (settings != null && settings.getProperty(EmailSettings.SHUTDOWN_MAIL)) {
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy'.'MM'.'dd'.' HH:mm:ss");
             Date date = new Date(System.currentTimeMillis());
-            emailService.sendShutDown(settings.getProperty(EmailSettings.SHUTDOWN_MAIL_ADDRESS),dateFormat.format(date));
+            emailService.sendShutDown(settings.getProperty(EmailSettings.SHUTDOWN_MAIL_ADDRESS), dateFormat.format(date));
         }
 
         // Do backup on stop if enabled

project/module-common/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -11,6 +11,7 @@ import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseString
 import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
 
 public final class PluginSettings implements SettingsHolder {
+
     @Comment({
             "Should we execute /help command when unregistered players press Shift+F?",
             "This keeps compatibility with some menu plugins",

project/module-logger/src/main/java/fr/xephi/authme/logger/ConsoleLogger.java

@@ -1,9 +1,6 @@
 package fr.xephi.authme.logger;
 
 import com.google.common.base.Throwables;
-import fr.xephi.authme.settings.Settings;
-import fr.xephi.authme.settings.properties.PluginSettings;
-import fr.xephi.authme.settings.properties.SecuritySettings;
 import fr.xephi.authme.util.ExceptionUtils;
 
 import java.io.Closeable;
@@ -67,11 +64,8 @@ public final class ConsoleLogger {
 
     /**
      * Sets logging settings which are shared by all logger instances.
-     *
-     * @param settings the settings to read from
      */
-    public static void initializeSharedSettings(Settings settings) {
+    public static void initialize(boolean useLogging) {
-        boolean useLogging = settings.getProperty(SecuritySettings.USE_LOGGING);
         if (useLogging) {
             initializeFileWriter();
         } else {
@@ -79,13 +73,37 @@ public final class ConsoleLogger {
         }
     }
 
-    /**
+    public static void initialize() {
-     * Sets logging settings which are individual to all loggers.
+        initialize(true);
-     *
+    }
-     * @param settings the settings to read from
+
-     */
+    // Disabled
-    public void initializeSettings(Settings settings) {
+//    /**
-        this.logLevel = settings.getProperty(PluginSettings.LOG_LEVEL);
+//     * Sets logging settings which are shared by all logger instances.
+//     *
+//     * @param settings the settings to read from
+//     */
+//    public static void initializeSharedSettings(Settings settings) {
+//        boolean useLogging = settings.getProperty(SecuritySettings.USE_LOGGING);
+//        if (useLogging) {
+//            initializeFileWriter();
+//        } else {
+//            closeFileWriter();
+//        }
+//    }
+
+    // Disabled
+//    /**
+//     * Sets logging settings which are individual to all loggers.
+//     *
+//     * @param settings the settings to read from
+//     */
+//    public void initializeSettings(Settings settings) {
+//        this.logLevel = settings.getProperty(PluginSettings.LOG_LEVEL);
+//    }
+
+    public void setLogLevel(LogLevel level) {
+        logLevel = level;
     }
 
     public LogLevel getLogLevel() {
@@ -286,4 +304,5 @@ public final class ConsoleLogger {
             }
         }
     }
+
 }

project/module-logger/src/main/java/fr/xephi/authme/logger/ConsoleLoggerFactory.java

@@ -1,7 +1,5 @@
 package fr.xephi.authme.logger;
 
-import fr.xephi.authme.settings.Settings;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -11,7 +9,6 @@ import java.util.concurrent.ConcurrentHashMap;
 public final class ConsoleLoggerFactory {
 
     private static final Map<String, ConsoleLogger> consoleLoggers = new ConcurrentHashMap<>();
-    private static Settings settings;
 
     private ConsoleLoggerFactory() {
     }
@@ -27,28 +24,12 @@ public final class ConsoleLoggerFactory {
         return consoleLoggers.computeIfAbsent(name, ConsoleLoggerFactory::createLogger);
     }
 
-    /**
-     * Sets up all loggers according to the properties returned by the settings instance.
-     *
-     * @param settings the settings instance
-     */
-    public static void reloadSettings(Settings settings) {
-        ConsoleLoggerFactory.settings = settings;
-        ConsoleLogger.initializeSharedSettings(settings);
-
-        consoleLoggers.values()
-            .forEach(logger -> logger.initializeSettings(settings));
-    }
-
     public static int getTotalLoggers() {
         return consoleLoggers.size();
     }
 
     private static ConsoleLogger createLogger(String name) {
-        ConsoleLogger logger = new ConsoleLogger(name);
+        return new ConsoleLogger(name);
-        if (settings != null) {
-            logger.initializeSettings(settings);
-        }
-        return logger;
     }
+
 }

project/module-mail/build.gradle.kts

@@ -1,5 +1,4 @@
 dependencies {
-    compileOnly(project(":project:module-common"))
     compileOnly(project(":project:module-logger"))
     compileOnly(project(":project:module-util"))
     compileOnly(libs.configme)

project/module-security/build.gradle.kts

@@ -1,6 +1,7 @@
 dependencies {
     compileOnly(project(":project:module-util"))
     compileOnly(libs.guava)
+    compileOnly(libs.configme)
     compileOnly(libs.jalu.injector)
     // PBKDF2 implementation
     implementation("de.rtner:PBKDF2:1.1.4")

project/module-util/build.gradle.kts

@@ -1,6 +1,5 @@
 dependencies {
     compileOnly(project(":project:module-logger"))
-    compileOnly(project(":project:module-common"))
     compileOnly(libs.guava)
     // String comparison library. Used for dynamic help system.
     implementation("net.ricecode:string-similarity:1.0.0")