Remove configruation of LogLevel
This commit is contained in:
parent
7e499348cf
commit
d22ec8c34a
@ -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;
|
||||
@ -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
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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) {
|
||||
boolean useLogging = settings.getProperty(SecuritySettings.USE_LOGGING);
|
||||
public static void initialize(boolean useLogging) {
|
||||
if (useLogging) {
|
||||
initializeFileWriter();
|
||||
} else {
|
||||
@ -79,13 +73,37 @@ public final class ConsoleLogger {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 static void initialize() {
|
||||
initialize(true);
|
||||
}
|
||||
|
||||
// Disabled
|
||||
// /**
|
||||
// * 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 {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -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);
|
||||
if (settings != null) {
|
||||
logger.initializeSettings(settings);
|
||||
}
|
||||
return logger;
|
||||
return new ConsoleLogger(name);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,4 @@
|
||||
dependencies {
|
||||
compileOnly(project(":project:module-common"))
|
||||
compileOnly(project(":project:module-logger"))
|
||||
compileOnly(project(":project:module-util"))
|
||||
compileOnly(libs.configme)
|
||||
|
||||
@ -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")
|
||||
|
||||
@ -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")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user