From 776b453c9108faff0ce6929f1ff8f74cce927c2f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 30 Jan 2014 14:40:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
similarity index 96%
rename from opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java
rename to opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
index 5508f94..0398429 100644
--- a/opendj-slf4j-adapter/src/main/java/org/slf4j/impl/OpenDJLoggerAdapter.java
+++ b/opendj-slf4j-adapter/src/main/java/org/opends/server/loggers/OpenDJLoggerAdapter.java
@@ -23,15 +23,11 @@
*
* Copyright 2014 ForgeRock AS.
*/
-package org.slf4j.impl;
+package org.opends.server.loggers;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedMarker;
import org.opends.messages.Severity;
-import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
import org.slf4j.Logger;
import org.slf4j.Marker;
@@ -59,8 +55,11 @@
* The name of logger.
*/
public OpenDJLoggerAdapter(final String name) {
- this.name = name;
+ // Tracer always use the provided name
+ // which should be a classname
this.tracer = DebugLogger.getTracer(name);
+ // Name is simplified if possible
+ this.name = LoggingCategoryNames.getCategoryName(name);
}
/** {@inheritDoc} */
@@ -71,13 +70,13 @@
/** Trace with message only. */
private void logTraceMessage(String msg) {
- tracer.debugMessage(DebugLogLevel.VERBOSE, msg);
+ tracer.trace(msg);
}
/** Trace with message and exception. */
- private void logTraceException(@SuppressWarnings("unused") String message, Throwable t) {
- tracer.debugCaught(DebugLogLevel.VERBOSE, t);
+ private void logTraceException(String message, Throwable t) {
+ tracer.traceException(message, t);
}
/**
--
Gitblit v1.10.0