From 30b9978d6d506e0ea1689cf0ea32f7b92cf8d4ea Mon Sep 17 00:00:00 2001 From: rjenkinsjr Date: Mon, 28 Mar 2016 18:24:17 -0400 Subject: [PATCH] Added support for static logger initialization If the plugin is not ready or otherwise cannot be found, the Bukkit server logger is used instead --- .../slf4j/impl/BukkitPluginLoggerAdapter.java | 341 +++++++++++------- .../slf4j/impl/BukkitPluginLoggerFactory.java | 1 - 2 files changed, 206 insertions(+), 136 deletions(-) diff --git a/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java b/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java index 5a22754..1e795f1 100644 --- a/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java +++ b/src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java @@ -49,6 +49,7 @@ import java.io.InputStream; import java.util.Map; import java.util.logging.Level; import java.util.logging.LogRecord; +import java.util.logging.Logger; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; @@ -62,7 +63,7 @@ import org.yaml.snakeyaml.Yaml; /** *

* A merger of SLF4J's {@code SimpleLogger} and {@code JDK14LoggerAdapter}, - * wired to log all messages to the Bukkit plugin found in this plugin's + * wired to log all messages to the Bukkit plugin found in this class's * classloader (by way of reading plugin.yml). *

* @@ -91,16 +92,19 @@ import org.yaml.snakeyaml.Yaml; * level of nearest parent logger will be used, and if none is set, then the * value specified by slf4j.defaultLogLevel will be used. * + *
  • slf4j.showHeader -Set to true if you want to + * output the [SLF4J]. Defaults to false.
    • + * *
  • slf4j.showThreadName -Set to true if you want - * to output the current thread name. Defaults to true.
    • + * to output the current thread name. Defaults to false. * *
  • slf4j.showLogName - Set to true if you want the * Logger instance name to be included in output messages. Defaults to - * true.
    • + * false. * *
  • slf4j.showShortLogName - Set to true if you * want the last component of the name to be included in output messages. - * Defaults to false.
    • + * Defaults to true. * * * @@ -131,37 +135,42 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase // Plugin reference. private static transient Plugin BUKKIT_PLUGIN; - + // Constants for JUL record creation. + private static final String CLASS_SELF = BukkitPluginLoggerAdapter.class.getName(); + private static final String CLASS_SUPER = MarkerIgnoringBase.class.getName(); // Configuration parameters. private static int CONFIG_DEFAULT_LOG_LEVEL; private static final String CONFIG_FALLBACK_DEFAULT_LOG_LEVEL = "info"; - private static final boolean CONFIG_FALLBACK_SHOW_LOG_NAME = true; - private static final boolean CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME = false; - private static final boolean CONFIG_FALLBACK_SHOW_THREAD_NAME = true; + private static final boolean CONFIG_FALLBACK_SHOW_HEADER = false; + private static final boolean CONFIG_FALLBACK_SHOW_LOG_NAME = false; + private static final boolean CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME = true; + private static final boolean CONFIG_FALLBACK_SHOW_THREAD_NAME = false; private static final String CONFIG_KEY_DEFAULT_LOG_LEVEL = "slf4j.defaultLogLevel"; private static final String CONFIG_KEY_PREFIX_LOG = "slf4j.log."; + private static final String CONFIG_KEY_SHOW_HEADER = "slf4j.showHeader"; private static final String CONFIG_KEY_SHOW_LOG_NAME = "slf4j.showLogName"; private static final String CONFIG_KEY_SHOW_SHORT_LOG_NAME = "slf4j.showShortLogName"; private static final String CONFIG_KEY_SHOW_THREAD_NAME = "slf4j.showThreadName"; + private static boolean CONFIG_SHOW_HEADER; private static boolean CONFIG_SHOW_LOG_NAME; private static boolean CONFIG_SHOW_SHORT_LOG_NAME; private static boolean CONFIG_SHOW_THREAD_NAME; + // Initialization status. + private static boolean INIT_FAILURE_WARNED = false; // Logging level constants. private static final int LOG_LEVEL_DEBUG = LocationAwareLogger.DEBUG_INT; private static final int LOG_LEVEL_ERROR = LocationAwareLogger.ERROR_INT; private static final int LOG_LEVEL_INFO = LocationAwareLogger.INFO_INT; private static final int LOG_LEVEL_TRACE = LocationAwareLogger.TRACE_INT; private static final int LOG_LEVEL_WARN = LocationAwareLogger.WARN_INT; - // Constants for JUL record creation. - private static final String SELF = BukkitPluginLoggerAdapter.class.getName(); + // serialVersionUID private static final long serialVersionUID = -2270127287235697381L; - private static final String SUPER = MarkerIgnoringBase.class.getName(); /** The current log level */ protected int currentLogLevel = BukkitPluginLoggerAdapter.LOG_LEVEL_INFO; /** The short name of this simple log instance */ private transient String shortLogName = null; - // WARN: BukkitPluginLoggerAdapter constructor should have only package access + // NOTE: BukkitPluginLoggerAdapter constructor should have only package access // so that only BukkitPluginLoggerFactory be able to create one. BukkitPluginLoggerAdapter(final String name) { this.name = name; @@ -173,59 +182,111 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase } } - // Initialize class attributes, relying on plugin configuration. - public static void init() { - // Get a reference to the plugin in this classloader. - InputStream pluginYmlFile = null; - try { - pluginYmlFile = BukkitPluginLoggerAdapter.class.getClassLoader() - .getResource("plugin.yml") - .openStream(); - final Yaml yaml = new Yaml(); - @SuppressWarnings("rawtypes") - final Map pluginYml = (Map) yaml.load(pluginYmlFile); - BukkitPluginLoggerAdapter.BUKKIT_PLUGIN = Bukkit.getPluginManager() - .getPlugin((String) pluginYml.get("name")); - } catch (final IOException e) { - throw new IllegalStateException(e); - } finally { - if (pluginYmlFile != null) { - try { - pluginYmlFile.close(); - } catch (final IOException e) { - e.printStackTrace(); + /** + * (Re)initializes all SLF4Bukkit loggers, relying on the YAML configuration + * of the containing plugin. + * + * @param reinitialize + * set to {@code true} to reinitialize all loggers, e.g. after + * reloading the plugin config. + */ + public static void init(final boolean reinitialize) { + synchronized (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN) { + // Do not re-initialize unless requested. + if (reinitialize) { + BukkitPluginLoggerAdapter.BUKKIT_PLUGIN = null; + } else if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN != null) { return; } + // Get a reference to the plugin in this classloader. + InputStream pluginYmlFile = null; + String pluginName; + try { + pluginYmlFile = BukkitPluginLoggerAdapter.class.getClassLoader() + .getResource("plugin.yml") + .openStream(); + final Yaml yaml = new Yaml(); + @SuppressWarnings("rawtypes") + final Map pluginYml = (Map) yaml.load(pluginYmlFile); + pluginName = (String) pluginYml.get("name"); + } catch (final IOException e) { + throw new IllegalStateException(e); + } finally { + if (pluginYmlFile != null) { + try { + pluginYmlFile.close(); + } catch (final IOException e) { + e.printStackTrace(); + } } } + // Get the plugin. + BukkitPluginLoggerAdapter.BUKKIT_PLUGIN = Bukkit.getPluginManager() + .getPlugin(pluginName); + if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null) { + // Initialization failed. + if (!BukkitPluginLoggerAdapter.INIT_FAILURE_WARNED) { + System.err.println("WARN: SLF4Bukkit could not be initialized for plugin " + + pluginName + "; default configuration assumed!"); + } + BukkitPluginLoggerAdapter.INIT_FAILURE_WARNED = true; + } else { + // Initialization successful. + BukkitPluginLoggerAdapter.INIT_FAILURE_WARNED = false; + } + // Get the configuration values. + // 1. Look in the plugin's on-disk config. + // 2. If the value is absent, use the plugin's built-in config. + // 3. If the value is absent, use the default values hardcoded above. + // (1 and 2 are handled by using the Bukkit API.) + BukkitPluginLoggerAdapter.CONFIG_DEFAULT_LOG_LEVEL = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_DEFAULT_LOG_LEVEL, + BukkitPluginLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL)); + BukkitPluginLoggerAdapter.CONFIG_SHOW_HEADER = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_HEADER, + BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_HEADER); + BukkitPluginLoggerAdapter.CONFIG_SHOW_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_LOG_NAME, + BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_LOG_NAME); + BukkitPluginLoggerAdapter.CONFIG_SHOW_SHORT_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_SHORT_LOG_NAME, + BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME); + BukkitPluginLoggerAdapter.CONFIG_SHOW_THREAD_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_THREAD_NAME, + BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_THREAD_NAME); } - // Get the configuration values. - // 1. Look in the plugin's on-disk config. - // 2. If the value is absent, use the plugin's built-in config. - // 3. If the value is absent, use the default values hardcoded above. - // (1 and 2 are handled by using the Bukkit API.) - BukkitPluginLoggerAdapter.CONFIG_DEFAULT_LOG_LEVEL = BukkitPluginLoggerAdapter.stringToLevel(BukkitPluginLoggerAdapter.getStringProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_DEFAULT_LOG_LEVEL, - BukkitPluginLoggerAdapter.CONFIG_FALLBACK_DEFAULT_LOG_LEVEL)); - BukkitPluginLoggerAdapter.CONFIG_SHOW_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_LOG_NAME, - BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_LOG_NAME); - BukkitPluginLoggerAdapter.CONFIG_SHOW_SHORT_LOG_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_SHORT_LOG_NAME, - BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_SHORT_LOG_NAME); - BukkitPluginLoggerAdapter.CONFIG_SHOW_THREAD_NAME = BukkitPluginLoggerAdapter.getBooleanProperty(BukkitPluginLoggerAdapter.CONFIG_KEY_SHOW_THREAD_NAME, - BukkitPluginLoggerAdapter.CONFIG_FALLBACK_SHOW_THREAD_NAME); } private static boolean getBooleanProperty(final String name, final boolean defaultValue) { - final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig() - .getString(name); - return (prop == null) ? defaultValue : "true".equalsIgnoreCase(prop); + synchronized (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN) { + if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null) { return defaultValue; } + final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig() + .getString(name); + return (prop == null) ? defaultValue : "true".equalsIgnoreCase(prop); + } + } + + /** + * Returns the most appropriate logger. + * + * @return the logger for the plugin if available; otherwise the server + * logger. Never null. + */ + private static Logger getBukkitLogger() { + synchronized (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN) { + return BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null ? Bukkit.getLogger() + : BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getLogger(); + } } private static String getStringProperty(final String name, final String defaultValue) { - final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig() - .getString(name); - return (prop == null) ? defaultValue : prop; + synchronized (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN) { + if (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN == null) { return defaultValue; } + final String prop = BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getConfig() + .getString(name); + return (prop == null) ? defaultValue : prop; + } } + /* + * Logger API implementations + */ + private static int stringToLevel(final String levelStr) { if ("trace".equalsIgnoreCase(levelStr)) { return BukkitPluginLoggerAdapter.LOG_LEVEL_TRACE; @@ -242,17 +303,13 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase } } - /* - * Logger API implementations - */ - /** * A simple implementation which logs messages of level DEBUG according * to the format outlined above. */ @Override public void debug(final String msg) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_DEBUG, msg, null); } @@ -290,7 +347,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase /** Log a message of level DEBUG, including an exception. */ @Override public void debug(final String msg, final Throwable t) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_DEBUG, msg, t); } @@ -300,7 +357,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase */ @Override public void error(final String msg) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_ERROR, msg, null); } @@ -337,7 +394,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase /** Log a message of level ERROR, including an exception. */ @Override public void error(final String msg, final Throwable t) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_ERROR, msg, t); } @@ -347,7 +404,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase */ @Override public void info(final String msg) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_INFO, msg, null); } @@ -384,7 +441,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase /** Log a message of level INFO, including an exception. */ @Override public void info(final String msg, final Throwable t) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_INFO, msg, t); } @@ -435,7 +492,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase */ @Override public void trace(final String msg) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_TRACE, msg, null); } @@ -473,7 +530,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase /** Log a message of level TRACE, including an exception. */ @Override public void trace(final String msg, final Throwable t) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_TRACE, msg, t); } @@ -483,7 +540,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase */ @Override public void warn(final String msg) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_WARN, msg, null); } @@ -517,16 +574,67 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase arg2); } + /* + * Logic from SimpleLogger/JDK14LoggerAdapter + */ + /** Log a message of level WARN, including an exception. */ @Override public void warn(final String msg, final Throwable t) { - this.log(BukkitPluginLoggerAdapter.SELF, + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, BukkitPluginLoggerAdapter.LOG_LEVEL_WARN, msg, t); } - /* - * SimpleLogger functionality + /** + * For formatted messages, first substitute arguments and then log. + * + * @param level + * @param format + * @param arguments + * a list of 3 ore more arguments */ + private void formatAndLog(final int level, final String format, + final Object... arguments) { + BukkitPluginLoggerAdapter.init(false); + if (!this.isLevelEnabled(level)) { return; } + final FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments); + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, level, tp.getMessage(), + tp.getThrowable()); + } + + /** + * For formatted messages, first substitute arguments and then log. + * + * @param level + * @param format + * @param arg1 + * @param arg2 + */ + private void formatAndLog(final int level, final String format, + final Object arg1, final Object arg2) { + BukkitPluginLoggerAdapter.init(false); + if (!this.isLevelEnabled(level)) { return; } + final FormattingTuple tp = MessageFormatter.format(format, arg1, arg2); + this.log(BukkitPluginLoggerAdapter.CLASS_SELF, level, tp.getMessage(), + tp.getThrowable()); + } + + /** + * Is the given log level currently enabled? + * + * @param logLevel + * is this level enabled? + */ + private boolean isLevelEnabled(final int logLevel) { + // log level are numerically ordered so can use simple numeric comparison + // + // the PLUGIN.getLogger().isLoggable() check avoids the unconditional + // construction of location data for disabled log statements. As of + // 2008-07-31, callers of this method do not perform this check. See also + // http://jira.qos.ch/browse/SLF4J-81 + return (logLevel >= this.currentLogLevel) + && (BukkitPluginLoggerAdapter.getBukkitLogger().isLoggable(this.slf4jLevelIntToBukkitJULLevel(logLevel))); + } /** * Fill in caller data if possible. @@ -534,15 +642,15 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase * @param record * The record to update */ - final private void bukkitFillCallerData(final String callerFQCN, - final LogRecord record) { + private void + julFillCallerData(final String callerFQCN, final LogRecord record) { final StackTraceElement[] steArray = new Throwable().getStackTrace(); int selfIndex = -1; for (int i = 0; i < steArray.length; i++) { final String className = steArray[i].getClassName(); if (className.equals(callerFQCN) - || className.equals(BukkitPluginLoggerAdapter.SUPER)) { + || className.equals(BukkitPluginLoggerAdapter.CLASS_SUPER)) { selfIndex = i; break; } @@ -551,7 +659,7 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase int found = -1; for (int i = selfIndex + 1; i < steArray.length; i++) { final String className = steArray[i].getClassName(); - if (!(className.equals(callerFQCN) || className.equals(BukkitPluginLoggerAdapter.SUPER))) { + if (!(className.equals(callerFQCN) || className.equals(BukkitPluginLoggerAdapter.CLASS_SUPER))) { found = i; break; } @@ -573,69 +681,22 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase * * See bug report #13 for more details. * + * @param logger * @param level * @param msg * @param t */ - private void bukkitLog(final String callerFQCN, final Level level, - final String msg, final Throwable t) { + private void julLog(final Logger logger, final String callerFQCN, + final Level level, final String msg, final Throwable t) { // millis and thread are filled by the constructor final LogRecord record = new LogRecord(level, msg); record.setLoggerName(this.getName()); record.setThrown(t); // Note: parameters in record are not set because SLF4J only // supports a single formatting style - this.bukkitFillCallerData(callerFQCN, record); - BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getLogger().log(record); - } - - /** - * For formatted messages, first substitute arguments and then log. - * - * @param level - * @param format - * @param arguments - * a list of 3 ore more arguments - */ - private void formatAndLog(final int level, final String format, - final Object... arguments) { - if (!this.isLevelEnabled(level)) { return; } - final FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments); - this.log(BukkitPluginLoggerAdapter.SELF, level, tp.getMessage(), - tp.getThrowable()); - } - - /** - * For formatted messages, first substitute arguments and then log. - * - * @param level - * @param format - * @param arg1 - * @param arg2 - */ - private void formatAndLog(final int level, final String format, - final Object arg1, final Object arg2) { - if (!this.isLevelEnabled(level)) { return; } - final FormattingTuple tp = MessageFormatter.format(format, arg1, arg2); - this.log(BukkitPluginLoggerAdapter.SELF, level, tp.getMessage(), - tp.getThrowable()); - } - - /** - * Is the given log level currently enabled? - * - * @param logLevel - * is this level enabled? - */ - private boolean isLevelEnabled(final int logLevel) { - // log level are numerically ordered so can use simple numeric comparison - // - // the PLUGIN.getLogger().isLoggable() check avoids the unconditional - // construction of location data for disabled log statements. As of - // 2008-07-31, callers of this method do not perform this check. See also - // http://jira.qos.ch/browse/SLF4J-81 - return (logLevel >= this.currentLogLevel) - && (BukkitPluginLoggerAdapter.BUKKIT_PLUGIN.getLogger().isLoggable(this.slf4jLevelIntToBukkitJULLevel(logLevel))); + this.julFillCallerData(callerFQCN, record); + System.out.println(logger); + logger.log(record); } /** @@ -653,21 +714,36 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase */ private void log(final String callerFQCN, final int level, final String message, final Throwable t) { + // Determine which logger will be used. + final Logger logger = BukkitPluginLoggerAdapter.getBukkitLogger(); + + // Ensure that the logger will accept this request. + BukkitPluginLoggerAdapter.init(false); if (!this.isLevelEnabled(level)) { return; } + // Prepare message final StringBuilder buf = new StringBuilder(32); // Indicate that this message comes from SLF4J - buf.append("[SLF4J"); + buf.append('['); + if (BukkitPluginLoggerAdapter.CONFIG_SHOW_HEADER) { + buf.append("SLF4J"); + } // Append a readable representation of the log level, but only for log // levels that Bukkit would otherwise eat switch (level) { case LOG_LEVEL_TRACE: - buf.append(":TRACE"); + if (BukkitPluginLoggerAdapter.CONFIG_SHOW_HEADER) { + buf.append('|'); + } + buf.append("TRACE"); break; case LOG_LEVEL_DEBUG: - buf.append(":DEBUG"); + if (BukkitPluginLoggerAdapter.CONFIG_SHOW_HEADER) { + buf.append('|'); + } + buf.append("DEBUG"); break; } buf.append("] "); @@ -693,15 +769,10 @@ public final class BukkitPluginLoggerAdapter extends MarkerIgnoringBase buf.append(message); // Log to Bukkit - this.bukkitLog(BukkitPluginLoggerAdapter.SELF, - this.slf4jLevelIntToBukkitJULLevel(level), buf.toString(), t); - + this.julLog(logger, BukkitPluginLoggerAdapter.CLASS_SELF, + this.slf4jLevelIntToBukkitJULLevel(level), buf.toString(), t); } - /* - * JDK14LoggerAdapter functionality - */ - private String recursivelyComputeLevelString() { String tempName = this.name; String levelString = null; diff --git a/src/main/java/org/slf4j/impl/BukkitPluginLoggerFactory.java b/src/main/java/org/slf4j/impl/BukkitPluginLoggerFactory.java index 44a5702..0e0047f 100644 --- a/src/main/java/org/slf4j/impl/BukkitPluginLoggerFactory.java +++ b/src/main/java/org/slf4j/impl/BukkitPluginLoggerFactory.java @@ -65,7 +65,6 @@ public class BukkitPluginLoggerFactory implements ILoggerFactory { public BukkitPluginLoggerFactory() { this.loggerMap = new ConcurrentHashMap(); - BukkitPluginLoggerAdapter.init(); // ensure jul initialization. see also SLF4J-359 java.util.logging.LogManager.getLogManager(); }