#3084: (Regrettably) add a full SLF4J wrapper
This commit is contained in:
parent
ada1b95ffc
commit
5fa596fee9
1
pom.xml
1
pom.xml
@ -41,6 +41,7 @@
|
|||||||
<module>protocol</module>
|
<module>protocol</module>
|
||||||
<module>proxy</module>
|
<module>proxy</module>
|
||||||
<module>query</module>
|
<module>query</module>
|
||||||
|
<module>slf4j</module>
|
||||||
<module>native</module>
|
<module>native</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
|
@ -79,6 +79,12 @@
|
|||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.md-5</groupId>
|
||||||
|
<artifactId>bungeecord-slf4j</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sf.jopt-simple</groupId>
|
<groupId>net.sf.jopt-simple</groupId>
|
||||||
<artifactId>jopt-simple</artifactId>
|
<artifactId>jopt-simple</artifactId>
|
||||||
@ -110,12 +116,6 @@
|
|||||||
<version>1.6.2</version>
|
<version>1.6.2</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-jdk14</artifactId>
|
|
||||||
<version>1.7.30</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -95,6 +95,7 @@ import net.md_5.bungee.query.RemoteQuery;
|
|||||||
import net.md_5.bungee.scheduler.BungeeScheduler;
|
import net.md_5.bungee.scheduler.BungeeScheduler;
|
||||||
import net.md_5.bungee.util.CaseInsensitiveMap;
|
import net.md_5.bungee.util.CaseInsensitiveMap;
|
||||||
import org.fusesource.jansi.AnsiConsole;
|
import org.fusesource.jansi.AnsiConsole;
|
||||||
|
import org.slf4j.impl.JDK14LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main BungeeCord proxy class.
|
* Main BungeeCord proxy class.
|
||||||
@ -215,6 +216,7 @@ public class BungeeCord extends ProxyServer
|
|||||||
consoleReader.addCompleter( new ConsoleCommandCompleter( this ) );
|
consoleReader.addCompleter( new ConsoleCommandCompleter( this ) );
|
||||||
|
|
||||||
logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
|
logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
|
||||||
|
JDK14LoggerFactory.LOGGER = logger;
|
||||||
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
|
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
|
||||||
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
|
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
|
||||||
|
|
||||||
|
31
slf4j/nb-configuration.xml
Normal file
31
slf4j/nb-configuration.xml
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project-shared-configuration>
|
||||||
|
<!--
|
||||||
|
This file contains additional configuration written by modules in the NetBeans IDE.
|
||||||
|
The configuration is intended to be shared among all the users of project and
|
||||||
|
therefore it is assumed to be part of version control checkout.
|
||||||
|
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
|
||||||
|
-->
|
||||||
|
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
|
||||||
|
<!--
|
||||||
|
Properties that influence various parts of the IDE, especially code formatting and the like.
|
||||||
|
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
|
||||||
|
That way multiple projects can share the same settings (useful for formatting rules for example).
|
||||||
|
Any value defined here will override the pom.xml file value but is only applicable to the current project.
|
||||||
|
-->
|
||||||
|
<org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>NEW_LINE</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinMethodCallParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSwitchParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinCatchParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinTryParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinSynchronizedParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinArrayInitBrackets>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinWhileParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinIfParens>
|
||||||
|
<org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
|
||||||
|
</properties>
|
||||||
|
</project-shared-configuration>
|
35
slf4j/pom.xml
Normal file
35
slf4j/pom.xml
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>net.md-5</groupId>
|
||||||
|
<artifactId>bungeecord-parent</artifactId>
|
||||||
|
<version>1.16-R0.5-SNAPSHOT</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<groupId>net.md-5</groupId>
|
||||||
|
<artifactId>bungeecord-slf4j</artifactId>
|
||||||
|
<version>1.16-R0.5-SNAPSHOT</version>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
|
<name>BungeeCord-SLF4J</name>
|
||||||
|
<description>Wrapper over SLF4J for BungeeCord purposes.</description>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<checkstyle.skip>true</checkstyle.skip>
|
||||||
|
<maven.deploy.skip>true</maven.deploy.skip>
|
||||||
|
<maven.javadoc.skip>true</maven.javadoc.skip>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
<version>1.7.30</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
694
slf4j/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
Normal file
694
slf4j/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
Normal file
@ -0,0 +1,694 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2004-2011 QOS.ch
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.slf4j.impl;
|
||||||
|
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.LogRecord;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.Marker;
|
||||||
|
import org.slf4j.event.EventConstants;
|
||||||
|
import org.slf4j.event.LoggingEvent;
|
||||||
|
import org.slf4j.helpers.FormattingTuple;
|
||||||
|
import org.slf4j.helpers.MarkerIgnoringBase;
|
||||||
|
import org.slf4j.helpers.MessageFormatter;
|
||||||
|
import org.slf4j.spi.LocationAwareLogger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A wrapper over {@link java.util.logging.Logger java.util.logging.Logger} in
|
||||||
|
* conformity with the {@link Logger} interface. Note that the logging levels
|
||||||
|
* mentioned in this class refer to those defined in the java.util.logging
|
||||||
|
* package.
|
||||||
|
*
|
||||||
|
* @author Ceki Gülcü
|
||||||
|
* @author Peter Royal
|
||||||
|
*/
|
||||||
|
public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements LocationAwareLogger {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -8053026990503422791L;
|
||||||
|
|
||||||
|
transient final java.util.logging.Logger logger;
|
||||||
|
|
||||||
|
// WARN: JDK14LoggerAdapter constructor should have only package access so
|
||||||
|
// that only JDK14LoggerFactory be able to create one.
|
||||||
|
JDK14LoggerAdapter(java.util.logging.Logger logger) {
|
||||||
|
this.logger = logger;
|
||||||
|
this.name = logger.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this logger instance enabled for the FINEST level?
|
||||||
|
*
|
||||||
|
* @return True if this Logger is enabled for level FINEST, false otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isTraceEnabled() {
|
||||||
|
return logger.isLoggable(Level.FINEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message object at level FINEST.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* - the message object to be logged
|
||||||
|
*/
|
||||||
|
public void trace(String msg) {
|
||||||
|
if (logger.isLoggable(Level.FINEST)) {
|
||||||
|
log(SELF, Level.FINEST, msg, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINEST according to the specified format and
|
||||||
|
* argument.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for level FINEST.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg
|
||||||
|
* the argument
|
||||||
|
*/
|
||||||
|
public void trace(String format, Object arg) {
|
||||||
|
if (logger.isLoggable(Level.FINEST)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg);
|
||||||
|
log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINEST according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the FINEST level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg1
|
||||||
|
* the first argument
|
||||||
|
* @param arg2
|
||||||
|
* the second argument
|
||||||
|
*/
|
||||||
|
public void trace(String format, Object arg1, Object arg2) {
|
||||||
|
if (logger.isLoggable(Level.FINEST)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg1, arg2);
|
||||||
|
log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINEST according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the FINEST level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param argArray
|
||||||
|
* an array of arguments
|
||||||
|
*/
|
||||||
|
public void trace(String format, Object... argArray) {
|
||||||
|
if (logger.isLoggable(Level.FINEST)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
|
||||||
|
log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log an exception (throwable) at level FINEST with an accompanying message.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* the message accompanying the exception
|
||||||
|
* @param t
|
||||||
|
* the exception (throwable) to log
|
||||||
|
*/
|
||||||
|
public void trace(String msg, Throwable t) {
|
||||||
|
if (logger.isLoggable(Level.FINEST)) {
|
||||||
|
log(SELF, Level.FINEST, msg, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this logger instance enabled for the FINE level?
|
||||||
|
*
|
||||||
|
* @return True if this Logger is enabled for level FINE, false otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isDebugEnabled() {
|
||||||
|
return logger.isLoggable(Level.FINE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message object at level FINE.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* - the message object to be logged
|
||||||
|
*/
|
||||||
|
public void debug(String msg) {
|
||||||
|
if (logger.isLoggable(Level.FINE)) {
|
||||||
|
log(SELF, Level.FINE, msg, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINE according to the specified format and argument.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for level FINE.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg
|
||||||
|
* the argument
|
||||||
|
*/
|
||||||
|
public void debug(String format, Object arg) {
|
||||||
|
if (logger.isLoggable(Level.FINE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg);
|
||||||
|
log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINE according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the FINE level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg1
|
||||||
|
* the first argument
|
||||||
|
* @param arg2
|
||||||
|
* the second argument
|
||||||
|
*/
|
||||||
|
public void debug(String format, Object arg1, Object arg2) {
|
||||||
|
if (logger.isLoggable(Level.FINE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg1, arg2);
|
||||||
|
log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level FINE according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the FINE level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param argArray
|
||||||
|
* an array of arguments
|
||||||
|
*/
|
||||||
|
public void debug(String format, Object... argArray) {
|
||||||
|
if (logger.isLoggable(Level.FINE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
|
||||||
|
log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log an exception (throwable) at level FINE with an accompanying message.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* the message accompanying the exception
|
||||||
|
* @param t
|
||||||
|
* the exception (throwable) to log
|
||||||
|
*/
|
||||||
|
public void debug(String msg, Throwable t) {
|
||||||
|
if (logger.isLoggable(Level.FINE)) {
|
||||||
|
log(SELF, Level.FINE, msg, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this logger instance enabled for the INFO level?
|
||||||
|
*
|
||||||
|
* @return True if this Logger is enabled for the INFO level, false otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isInfoEnabled() {
|
||||||
|
return logger.isLoggable(Level.INFO);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message object at the INFO level.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* - the message object to be logged
|
||||||
|
*/
|
||||||
|
public void info(String msg) {
|
||||||
|
if (logger.isLoggable(Level.INFO)) {
|
||||||
|
log(SELF, Level.INFO, msg, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level INFO according to the specified format and argument.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the INFO level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg
|
||||||
|
* the argument
|
||||||
|
*/
|
||||||
|
public void info(String format, Object arg) {
|
||||||
|
if (logger.isLoggable(Level.INFO)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg);
|
||||||
|
log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at the INFO level according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the INFO level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg1
|
||||||
|
* the first argument
|
||||||
|
* @param arg2
|
||||||
|
* the second argument
|
||||||
|
*/
|
||||||
|
public void info(String format, Object arg1, Object arg2) {
|
||||||
|
if (logger.isLoggable(Level.INFO)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg1, arg2);
|
||||||
|
log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level INFO according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the INFO level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param argArray
|
||||||
|
* an array of arguments
|
||||||
|
*/
|
||||||
|
public void info(String format, Object... argArray) {
|
||||||
|
if (logger.isLoggable(Level.INFO)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
|
||||||
|
log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log an exception (throwable) at the INFO level with an accompanying
|
||||||
|
* message.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* the message accompanying the exception
|
||||||
|
* @param t
|
||||||
|
* the exception (throwable) to log
|
||||||
|
*/
|
||||||
|
public void info(String msg, Throwable t) {
|
||||||
|
if (logger.isLoggable(Level.INFO)) {
|
||||||
|
log(SELF, Level.INFO, msg, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this logger instance enabled for the WARNING level?
|
||||||
|
*
|
||||||
|
* @return True if this Logger is enabled for the WARNING level, false
|
||||||
|
* otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isWarnEnabled() {
|
||||||
|
return logger.isLoggable(Level.WARNING);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message object at the WARNING level.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* - the message object to be logged
|
||||||
|
*/
|
||||||
|
public void warn(String msg) {
|
||||||
|
if (logger.isLoggable(Level.WARNING)) {
|
||||||
|
log(SELF, Level.WARNING, msg, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at the WARNING level according to the specified format and
|
||||||
|
* argument.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the WARNING level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg
|
||||||
|
* the argument
|
||||||
|
*/
|
||||||
|
public void warn(String format, Object arg) {
|
||||||
|
if (logger.isLoggable(Level.WARNING)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg);
|
||||||
|
log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at the WARNING level according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the WARNING level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg1
|
||||||
|
* the first argument
|
||||||
|
* @param arg2
|
||||||
|
* the second argument
|
||||||
|
*/
|
||||||
|
public void warn(String format, Object arg1, Object arg2) {
|
||||||
|
if (logger.isLoggable(Level.WARNING)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg1, arg2);
|
||||||
|
log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level WARNING according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the WARNING level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param argArray
|
||||||
|
* an array of arguments
|
||||||
|
*/
|
||||||
|
public void warn(String format, Object... argArray) {
|
||||||
|
if (logger.isLoggable(Level.WARNING)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
|
||||||
|
log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log an exception (throwable) at the WARNING level with an accompanying
|
||||||
|
* message.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* the message accompanying the exception
|
||||||
|
* @param t
|
||||||
|
* the exception (throwable) to log
|
||||||
|
*/
|
||||||
|
public void warn(String msg, Throwable t) {
|
||||||
|
if (logger.isLoggable(Level.WARNING)) {
|
||||||
|
log(SELF, Level.WARNING, msg, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this logger instance enabled for level SEVERE?
|
||||||
|
*
|
||||||
|
* @return True if this Logger is enabled for level SEVERE, false otherwise.
|
||||||
|
*/
|
||||||
|
public boolean isErrorEnabled() {
|
||||||
|
return logger.isLoggable(Level.SEVERE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message object at the SEVERE level.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* - the message object to be logged
|
||||||
|
*/
|
||||||
|
public void error(String msg) {
|
||||||
|
if (logger.isLoggable(Level.SEVERE)) {
|
||||||
|
log(SELF, Level.SEVERE, msg, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at the SEVERE level according to the specified format and
|
||||||
|
* argument.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the SEVERE level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg
|
||||||
|
* the argument
|
||||||
|
*/
|
||||||
|
public void error(String format, Object arg) {
|
||||||
|
if (logger.isLoggable(Level.SEVERE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg);
|
||||||
|
log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at the SEVERE level according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the SEVERE level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arg1
|
||||||
|
* the first argument
|
||||||
|
* @param arg2
|
||||||
|
* the second argument
|
||||||
|
*/
|
||||||
|
public void error(String format, Object arg1, Object arg2) {
|
||||||
|
if (logger.isLoggable(Level.SEVERE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.format(format, arg1, arg2);
|
||||||
|
log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log a message at level SEVERE according to the specified format and
|
||||||
|
* arguments.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* This form avoids superfluous object creation when the logger is disabled
|
||||||
|
* for the SEVERE level.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @param format
|
||||||
|
* the format string
|
||||||
|
* @param arguments
|
||||||
|
* an array of arguments
|
||||||
|
*/
|
||||||
|
public void error(String format, Object... arguments) {
|
||||||
|
if (logger.isLoggable(Level.SEVERE)) {
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
|
||||||
|
log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log an exception (throwable) at the SEVERE level with an accompanying
|
||||||
|
* message.
|
||||||
|
*
|
||||||
|
* @param msg
|
||||||
|
* the message accompanying the exception
|
||||||
|
* @param t
|
||||||
|
* the exception (throwable) to log
|
||||||
|
*/
|
||||||
|
public void error(String msg, Throwable t) {
|
||||||
|
if (logger.isLoggable(Level.SEVERE)) {
|
||||||
|
log(SELF, Level.SEVERE, msg, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Log the message at the specified level with the specified throwable if any.
|
||||||
|
* This method creates a LogRecord and fills in caller date before calling
|
||||||
|
* this instance's JDK14 logger.
|
||||||
|
*
|
||||||
|
* See bug report #13 for more details.
|
||||||
|
*
|
||||||
|
* @param level
|
||||||
|
* @param msg
|
||||||
|
* @param t
|
||||||
|
*/
|
||||||
|
private void log(String callerFQCN, Level level, String msg, Throwable t) {
|
||||||
|
// millis and thread are filled by the constructor
|
||||||
|
LogRecord record = new LogRecord(level, msg);
|
||||||
|
record.setLoggerName(getName());
|
||||||
|
record.setThrown(t);
|
||||||
|
// Note: parameters in record are not set because SLF4J only
|
||||||
|
// supports a single formatting style
|
||||||
|
fillCallerData(callerFQCN, record);
|
||||||
|
logger.log(record);
|
||||||
|
}
|
||||||
|
|
||||||
|
static String SELF = JDK14LoggerAdapter.class.getName();
|
||||||
|
static String SUPER = MarkerIgnoringBase.class.getName();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fill in caller data if possible.
|
||||||
|
*
|
||||||
|
* @param record
|
||||||
|
* The record to update
|
||||||
|
*/
|
||||||
|
final private void fillCallerData(String callerFQCN, LogRecord record) {
|
||||||
|
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(SUPER)) {
|
||||||
|
selfIndex = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int found = -1;
|
||||||
|
for (int i = selfIndex + 1; i < steArray.length; i++) {
|
||||||
|
final String className = steArray[i].getClassName();
|
||||||
|
if (!(className.equals(callerFQCN) || className.equals(SUPER))) {
|
||||||
|
found = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (found != -1) {
|
||||||
|
StackTraceElement ste = steArray[found];
|
||||||
|
// setting the class name has the side effect of setting
|
||||||
|
// the needToInferCaller variable to false.
|
||||||
|
record.setSourceClassName(ste.getClassName());
|
||||||
|
record.setSourceMethodName(ste.getMethodName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void log(Marker marker, String callerFQCN, int level, String message, Object[] argArray, Throwable t) {
|
||||||
|
Level julLevel = slf4jLevelIntToJULLevel(level);
|
||||||
|
// the logger.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
|
||||||
|
if (logger.isLoggable(julLevel)) {
|
||||||
|
log(callerFQCN, julLevel, message, t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Level slf4jLevelIntToJULLevel(int slf4jLevelInt) {
|
||||||
|
Level julLevel;
|
||||||
|
switch (slf4jLevelInt) {
|
||||||
|
case LocationAwareLogger.TRACE_INT:
|
||||||
|
julLevel = Level.FINEST;
|
||||||
|
break;
|
||||||
|
case LocationAwareLogger.DEBUG_INT:
|
||||||
|
julLevel = Level.FINE;
|
||||||
|
break;
|
||||||
|
case LocationAwareLogger.INFO_INT:
|
||||||
|
julLevel = Level.INFO;
|
||||||
|
break;
|
||||||
|
case LocationAwareLogger.WARN_INT:
|
||||||
|
julLevel = Level.WARNING;
|
||||||
|
break;
|
||||||
|
case LocationAwareLogger.ERROR_INT:
|
||||||
|
julLevel = Level.SEVERE;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new IllegalStateException("Level number " + slf4jLevelInt + " is not recognized.");
|
||||||
|
}
|
||||||
|
return julLevel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.7.15
|
||||||
|
*/
|
||||||
|
public void log(LoggingEvent event) {
|
||||||
|
Level julLevel = slf4jLevelIntToJULLevel(event.getLevel().toInt());
|
||||||
|
if (logger.isLoggable(julLevel)) {
|
||||||
|
LogRecord record = eventToRecord(event, julLevel);
|
||||||
|
logger.log(record);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private LogRecord eventToRecord(LoggingEvent event, Level julLevel) {
|
||||||
|
String format = event.getMessage();
|
||||||
|
Object[] arguments = event.getArgumentArray();
|
||||||
|
FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
|
||||||
|
if (ft.getThrowable() != null && event.getThrowable() != null) {
|
||||||
|
throw new IllegalArgumentException("both last element in argument array and last argument are of type Throwable");
|
||||||
|
}
|
||||||
|
|
||||||
|
Throwable t = event.getThrowable();
|
||||||
|
if (ft.getThrowable() != null) {
|
||||||
|
t = ft.getThrowable();
|
||||||
|
throw new IllegalStateException("fix above code");
|
||||||
|
}
|
||||||
|
|
||||||
|
LogRecord record = new LogRecord(julLevel, ft.getMessage());
|
||||||
|
record.setLoggerName(event.getLoggerName());
|
||||||
|
record.setMillis(event.getTimeStamp());
|
||||||
|
record.setSourceClassName(EventConstants.NA_SUBST);
|
||||||
|
record.setSourceMethodName(EventConstants.NA_SUBST);
|
||||||
|
|
||||||
|
record.setThrown(t);
|
||||||
|
return record;
|
||||||
|
}
|
||||||
|
}
|
73
slf4j/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java
Normal file
73
slf4j/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2004-2011 QOS.ch
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.slf4j.impl;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.ILoggerFactory;
|
||||||
|
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.ConcurrentMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* JDK14LoggerFactory is an implementation of {@link ILoggerFactory} returning
|
||||||
|
* the appropriately named {@link JDK14LoggerAdapter} instance.
|
||||||
|
*
|
||||||
|
* @author Ceki Gülcü
|
||||||
|
*/
|
||||||
|
public class JDK14LoggerFactory implements ILoggerFactory {
|
||||||
|
|
||||||
|
// key: name (String), value: a JDK14LoggerAdapter;
|
||||||
|
ConcurrentMap<String, Logger> loggerMap;
|
||||||
|
public static java.util.logging.Logger LOGGER; // BungeeCord
|
||||||
|
|
||||||
|
public JDK14LoggerFactory() {
|
||||||
|
loggerMap = new ConcurrentHashMap<String, Logger>();
|
||||||
|
// ensure jul initialization. see SLF4J-359
|
||||||
|
// note that call to java.util.logging.LogManager.getLogManager() fails on the Google App Engine platform. See SLF4J-363
|
||||||
|
java.util.logging.Logger.getLogger("");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* (non-Javadoc)
|
||||||
|
*
|
||||||
|
* @see org.slf4j.ILoggerFactory#getLogger(java.lang.String)
|
||||||
|
*/
|
||||||
|
public Logger getLogger(String name) {
|
||||||
|
// the root logger is called "" in JUL
|
||||||
|
if (name.equalsIgnoreCase(Logger.ROOT_LOGGER_NAME)) {
|
||||||
|
name = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger slf4jLogger = loggerMap.get(name);
|
||||||
|
if (slf4jLogger != null)
|
||||||
|
return slf4jLogger;
|
||||||
|
else {
|
||||||
|
java.util.logging.Logger julLogger = LOGGER; // BungeeCord - TODO: per-plugin loggers
|
||||||
|
Logger newInstance = new JDK14LoggerAdapter(julLogger);
|
||||||
|
Logger oldInstance = loggerMap.putIfAbsent(name, newInstance);
|
||||||
|
return oldInstance == null ? newInstance : oldInstance;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
80
slf4j/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Normal file
80
slf4j/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2004-2011 QOS.ch
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.slf4j.impl;
|
||||||
|
|
||||||
|
import org.slf4j.ILoggerFactory;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.slf4j.spi.LoggerFactoryBinder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The binding of {@link LoggerFactory} class with an actual instance of
|
||||||
|
* {@link ILoggerFactory} is performed using information returned by this class.
|
||||||
|
*
|
||||||
|
* @author Ceki Gülcü
|
||||||
|
*/
|
||||||
|
public class StaticLoggerBinder implements LoggerFactoryBinder {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique instance of this class.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the singleton of this class.
|
||||||
|
*
|
||||||
|
* @return the StaticLoggerBinder singleton
|
||||||
|
*/
|
||||||
|
public static final StaticLoggerBinder getSingleton() {
|
||||||
|
return SINGLETON;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Declare the version of the SLF4J API this implementation is compiled against.
|
||||||
|
* The value of this field is modified with each major release.
|
||||||
|
*/
|
||||||
|
// to avoid constant folding by the compiler, this field must *not* be final
|
||||||
|
public static String REQUESTED_API_VERSION = "1.6.99"; // !final
|
||||||
|
|
||||||
|
private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName();
|
||||||
|
|
||||||
|
/** The ILoggerFactory instance returned by the {@link #getLoggerFactory} method
|
||||||
|
* should always be the same object
|
||||||
|
*/
|
||||||
|
private final ILoggerFactory loggerFactory;
|
||||||
|
|
||||||
|
private StaticLoggerBinder() {
|
||||||
|
// Note: JCL gets substituted at build time by an appropriate Ant task
|
||||||
|
loggerFactory = new org.slf4j.impl.JDK14LoggerFactory();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ILoggerFactory getLoggerFactory() {
|
||||||
|
return loggerFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLoggerFactoryClassStr() {
|
||||||
|
return loggerFactoryClassStr;
|
||||||
|
}
|
||||||
|
}
|
68
slf4j/src/main/java/org/slf4j/impl/StaticMDCBinder.java
Normal file
68
slf4j/src/main/java/org/slf4j/impl/StaticMDCBinder.java
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2004-2011 QOS.ch
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.slf4j.impl;
|
||||||
|
|
||||||
|
import org.slf4j.helpers.BasicMDCAdapter;
|
||||||
|
import org.slf4j.spi.MDCAdapter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This implementation is bound to {@link BasicMDCAdapter}.
|
||||||
|
*
|
||||||
|
* @author Ceki Gülcü
|
||||||
|
*/
|
||||||
|
public class StaticMDCBinder {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique instance of this class.
|
||||||
|
*/
|
||||||
|
public static final StaticMDCBinder SINGLETON = new StaticMDCBinder();
|
||||||
|
|
||||||
|
private StaticMDCBinder() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the singleton of this class.
|
||||||
|
*
|
||||||
|
* @return the StaticMDCBinder singleton
|
||||||
|
* @since 1.7.14
|
||||||
|
*/
|
||||||
|
public static final StaticMDCBinder getSingleton() {
|
||||||
|
return SINGLETON;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Currently this method always returns an instance of
|
||||||
|
* {@link BasicMDCAdapter}.
|
||||||
|
*/
|
||||||
|
public MDCAdapter getMDCA() {
|
||||||
|
// note that this method is invoked only from within the static initializer of
|
||||||
|
// the org.slf4j.MDC class.
|
||||||
|
return new BasicMDCAdapter();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMDCAdapterClassStr() {
|
||||||
|
return BasicMDCAdapter.class.getName();
|
||||||
|
}
|
||||||
|
}
|
77
slf4j/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
Normal file
77
slf4j/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2004-2011 QOS.ch
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
package org.slf4j.impl;
|
||||||
|
|
||||||
|
import org.slf4j.IMarkerFactory;
|
||||||
|
import org.slf4j.MarkerFactory;
|
||||||
|
import org.slf4j.helpers.BasicMarkerFactory;
|
||||||
|
import org.slf4j.spi.MarkerFactoryBinder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* The binding of {@link MarkerFactory} class with an actual instance of
|
||||||
|
* {@link IMarkerFactory} is performed using information returned by this class.
|
||||||
|
*
|
||||||
|
* @author Ceki Gülcü
|
||||||
|
*/
|
||||||
|
public class StaticMarkerBinder implements MarkerFactoryBinder {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique instance of this class.
|
||||||
|
*/
|
||||||
|
public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder();
|
||||||
|
|
||||||
|
final IMarkerFactory markerFactory = new BasicMarkerFactory();
|
||||||
|
|
||||||
|
private StaticMarkerBinder() {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the singleton of this class.
|
||||||
|
*
|
||||||
|
* @return the StaticMarkerBinder singleton
|
||||||
|
* @since 1.7.14
|
||||||
|
*/
|
||||||
|
public static StaticMarkerBinder getSingleton() {
|
||||||
|
return SINGLETON;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Currently this method always returns an instance of
|
||||||
|
* {@link BasicMarkerFactory}.
|
||||||
|
*/
|
||||||
|
public IMarkerFactory getMarkerFactory() {
|
||||||
|
return markerFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Currently, this method returns the class name of
|
||||||
|
* {@link BasicMarkerFactory}.
|
||||||
|
*/
|
||||||
|
public String getMarkerFactoryClassStr() {
|
||||||
|
return BasicMarkerFactory.class.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user