From 22542acc2f7a03a735ae73c49c09252068ebc86d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 30 Jan 2014 13:38:30 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
index 3055502..095105a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -36,6 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg3;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -45,10 +46,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
-import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
-import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;
@@ -69,6 +68,8 @@
ConfigurationChangeListener<C>
{
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The storage designed to store log publishers. It is helpful in abstracting
* away the methods used to manage the collection.
@@ -257,13 +258,13 @@
}
catch(ConfigException e)
{
- debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
messages.add(e.getMessageObject());
resultCode = DirectoryServer.getServerErrorResultCode();
}
catch (Exception e)
{
- debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
messages.add(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(
String.valueOf(config.dn().toString()),
stackTraceToSingleLineString(e)));
@@ -273,14 +274,6 @@
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
- private void debugCaught(LogLevel error, Exception e)
- {
- if (DebugLogger.debugEnabled())
- {
- DebugLogger.getTracer().debugCaught(DebugLogLevel.ERROR, e);
- }
- }
-
private P findLogPublisher(DN dn)
{
Collection<P> logPublishers = getStorage().getLogPublishers();
--
Gitblit v1.10.0