[jboss-svn-commits] JBoss Common SVN: r3400 - common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 29 17:17:19 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-07-29 17:17:18 -0400 (Wed, 29 Jul 2009)
New Revision: 3400
Modified:
common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginImpl.java
common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginInstanceImpl.java
Log:
Refactor to reuse logger instances always and complete i18n support for those logger backends which support it
Modified: common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginImpl.java
===================================================================
--- common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginImpl.java 2009-07-29 21:17:12 UTC (rev 3399)
+++ common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginImpl.java 2009-07-29 21:17:18 UTC (rev 3400)
@@ -26,12 +26,14 @@
import org.jboss.logging.LoggerPluginInstance;
import org.jboss.logging.MDCProvider;
import org.jboss.logging.NDCProvider;
+import org.jboss.logging.MDCSupport;
+import org.jboss.logging.NDCSupport;
import org.jboss.logmanager.Logger;
/**
*
*/
-public class LoggerPluginImpl implements LoggerPlugin {
+public class LoggerPluginImpl implements LoggerPlugin, MDCSupport, NDCSupport {
private final MDCProvider mdcProvider;
private final NDCProvider ndcProvider;
private static final Logger.AttachmentKey<LoggerPluginInstance> KEY = new Logger.AttachmentKey<LoggerPluginInstance>();
@@ -41,11 +43,11 @@
ndcProvider = new NDCProviderImpl();
}
- public LoggerPluginInstance getInstance(String name) {
- Logger logger = Logger.getLogger(name);
+ public LoggerPluginInstance getInstance(String name, String resourceBundleName) {
+ Logger logger = resourceBundleName == null ? Logger.getLogger(name) : Logger.getLogger(name, resourceBundleName);
LoggerPluginInstance lpi = logger.getAttachment(KEY);
if (lpi == null) {
- lpi = new LoggerPluginInstanceImpl(logger);
+ lpi = new LoggerPluginInstanceImpl(name, resourceBundleName, logger);
LoggerPluginInstance appeared = logger.attachIfAbsent(KEY, lpi);
if (appeared != null) {
return appeared;
Modified: common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginInstanceImpl.java
===================================================================
--- common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginInstanceImpl.java 2009-07-29 21:17:12 UTC (rev 3399)
+++ common-logging-logmanager/trunk/src/main/java/org/jboss/logging/logmanager/LoggerPluginInstanceImpl.java 2009-07-29 21:17:18 UTC (rev 3400)
@@ -22,132 +22,55 @@
package org.jboss.logging.logmanager;
-import org.jboss.logging.*;
import org.jboss.logmanager.Logger;
import org.jboss.logmanager.Level;
import org.jboss.logmanager.ExtLogRecord;
+import org.jboss.logging.AbstractLoggerPluginInstance;
+import java.util.Map;
+import java.util.EnumMap;
/**
* The JBoss Common Logging plugin implementation.
*/
-public final class LoggerPluginInstanceImpl implements LoggerPluginInstance {
+public final class LoggerPluginInstanceImpl extends AbstractLoggerPluginInstance {
private final Logger logger;
- public LoggerPluginInstanceImpl(Logger logger) {
+ public LoggerPluginInstanceImpl(final String name, final String resourceBundleName, final Logger logger) {
+ super(name, resourceBundleName);
this.logger = logger;
}
- /** {@inheritDoc} */
- public boolean isTraceEnabled() {
- return logger.isLoggable(Level.TRACE);
- }
+ private static final Map<org.jboss.logging.Logger.Level, Level> LEVELS;
- public void trace(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.TRACE, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.TRACE, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
- }
+ static {
+ final EnumMap<org.jboss.logging.Logger.Level, Level> map = new EnumMap<org.jboss.logging.Logger.Level, Level>(org.jboss.logging.Logger.Level.class);
+ map.put(org.jboss.logging.Logger.Level.TRACE, Level.TRACE);
+ map.put(org.jboss.logging.Logger.Level.DEBUG, Level.DEBUG);
+ map.put(org.jboss.logging.Logger.Level.INFO, Level.INFO);
+ map.put(org.jboss.logging.Logger.Level.WARN, Level.WARN);
+ map.put(org.jboss.logging.Logger.Level.ERROR, Level.ERROR);
+ map.put(org.jboss.logging.Logger.Level.FATAL, Level.FATAL);
+ LEVELS = map;
}
- public void tracef(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.TRACE, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.TRACE, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
- }
+ public boolean isEnabled(final org.jboss.logging.Logger.Level level) {
+ return logger.isLoggable(LEVELS.get(level));
}
- /** {@inheritDoc} */
- @Deprecated
- public boolean isDebugEnabled() {
- return logger.isLoggable(Level.DEBUG);
- }
-
- public void debug(String loggerFcqn, Object message, Object[] params, Throwable t) {
+ public void log(final org.jboss.logging.Logger.Level level, final String loggerFqcn, final Object message, final Object[] params, final Throwable t) {
if (params == null) {
- logger.log(loggerFcqn, Level.DEBUG, String.valueOf(message), t);
+ logger.log(loggerFqcn, LEVELS.get(level), String.valueOf(message), t);
} else {
- logger.log(loggerFcqn, Level.DEBUG, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
+ logger.log(loggerFqcn, LEVELS.get(level), String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
}
}
- public void debugf(String loggerFcqn, Object message, Object[] params, Throwable t) {
+ public void logf(final org.jboss.logging.Logger.Level level, final String loggerFqcn, final String format, final Object[] params, final Throwable t) {
if (params == null) {
- logger.log(loggerFcqn, Level.DEBUG, String.valueOf(message), t);
+ logger.log(loggerFqcn, LEVELS.get(level), format, t);
} else {
- logger.log(loggerFcqn, Level.DEBUG, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
+ logger.log(loggerFqcn, LEVELS.get(level), format, ExtLogRecord.FormatStyle.PRINTF, params, t);
}
}
-
- /** {@inheritDoc} */
- @Deprecated
- public boolean isInfoEnabled() {
- return logger.isLoggable(Level.INFO);
- }
-
- public void info(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.INFO, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.INFO, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
- }
- }
-
- public void infof(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.INFO, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.INFO, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
- }
- }
-
- public void warn(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.WARN, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.WARN, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
- }
- }
-
- public void warnf(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.WARN, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.WARN, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
- }
- }
-
- public void error(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.ERROR, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.ERROR, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
- }
- }
-
- public void errorf(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.ERROR, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.ERROR, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
- }
- }
-
- public void fatal(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.FATAL, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.FATAL, String.valueOf(message), ExtLogRecord.FormatStyle.MESSAGE_FORMAT, params, t);
- }
- }
-
- public void fatalf(String loggerFcqn, Object message, Object[] params, Throwable t) {
- if (params == null) {
- logger.log(loggerFcqn, Level.FATAL, String.valueOf(message), t);
- } else {
- logger.log(loggerFcqn, Level.FATAL, String.valueOf(message), ExtLogRecord.FormatStyle.PRINTF, params, t);
- }
- }
}
More information about the jboss-svn-commits
mailing list