Minecraft/slf4bukkit
Archived
0
Fork 0
Code Activity

Finish integration with Bukkit

Browse Source 
Merged SimpleLogger and JDK14LoggerAdapter, tossing out irrelevant
functionality and routing TRACE/DEBUG to Bukkit's INFO level.
This commit is contained in:
rjenkinsjr
2016-03-28 15:00:23 -04:00
parent 70017cd881
commit aaee2297aa
2 changed files with 449 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

898
src/main/java/org/slf4j/impl/BukkitPluginLoggerAdapter.java
View File

File diff suppressed because it is too large Load Diff

56
src/main/java/org/slf4j/impl/BukkitPluginLoggerFactory.java
View File

@@ -44,72 +44,42 @@
*/ */
package org.slf4j.impl; package org.slf4j.impl;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import org.slf4j.ILoggerFactory; import org.slf4j.ILoggerFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.yaml.snakeyaml.Yaml;
import com.avaje.ebeaninternal.server.transaction.log.SimpleLogger;
/** /**
* BukkitPluginLoggerFactory is an implementation of {@link ILoggerFactory} * An implementation of {@link ILoggerFactory} which always returns
* returning the appropriately named {@link BukkitPluginLoggerAdapter} instance. * {@link SimpleLogger} instances.
* *
* @author Ceki Gülcü * @author Ceki Gülcü
* @author Ronald Jack Jenkins Jr.
*/ */
public class BukkitPluginLoggerFactory implements ILoggerFactory { public class BukkitPluginLoggerFactory implements ILoggerFactory {
// key: name (String), value: a BukkitPluginLoggerAdapter;
ConcurrentMap<String, Logger> loggerMap; ConcurrentMap<String, Logger> loggerMap;
// The name of the Bukkit plugin to which this factory belongs.
private final String pluginName;
public BukkitPluginLoggerFactory() { public BukkitPluginLoggerFactory() {
this.loggerMap = new ConcurrentHashMap<String, Logger>(); this.loggerMap = new ConcurrentHashMap<String, Logger>();
BukkitPluginLoggerAdapter.init();
// ensure jul initialization. see also SLF4J-359 // ensure jul initialization. see also SLF4J-359
java.util.logging.LogManager.getLogManager(); java.util.logging.LogManager.getLogManager();
// Get plugin name
InputStream pluginYmlFile = null;
try {
pluginYmlFile = this.getClass().getClassLoader()
.getResource("plugin.yml").openStream();
final Yaml yaml = new Yaml();
@SuppressWarnings("rawtypes")
final Map pluginYml = (Map) yaml.load(pluginYmlFile);
this.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();
}
}
}
} }
/* /**
* (non-Javadoc) * Return an appropriate {@link BukkitPluginLoggerAdapter} instance by name.
*
* @see org.slf4j.ILoggerFactory#getLogger(java.lang.String)
*/ */
@Override @Override
public Logger getLogger(String name) { public Logger getLogger(final String name) {
// the root logger is called "" in JUL final Logger bukkitLogger = this.loggerMap.get(name);
if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME)) { if (bukkitLogger != null) {
name = ""; return bukkitLogger;
}
final Logger slf4jLogger = this.loggerMap.get(name);
if (slf4jLogger != null) {
return slf4jLogger;
} else { } else {
final Logger newInstance = new BukkitPluginLoggerAdapter(this.pluginName); final Logger newInstance = new BukkitPluginLoggerAdapter(name);
final Logger oldInstance = this.loggerMap.putIfAbsent(name, newInstance); final Logger oldInstance = this.loggerMap.putIfAbsent(name, newInstance);
return oldInstance == null ? newInstance : oldInstance; return oldInstance == null ? newInstance : oldInstance;
} }