From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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/AbstractTextAccessLogPublisher.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 08e196e..84a32b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -26,7 +26,6 @@
package org.opends.server.loggers;
import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
import java.net.InetAddress;
@@ -38,6 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg2;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
@@ -51,7 +51,6 @@
import org.opends.server.authorization.dseecompat.PatternDN;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
-import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.AddressMask;
import org.forgerock.opendj.ldap.ByteString;
@@ -297,12 +296,8 @@
if (requestMatched == null)
{
// This should not happen.
- if (debugEnabled())
- {
- TRACER.debugWarning(
- "Operation attachment %s not found while logging response",
+ logger.trace("Operation attachment %s not found while logging response",
attachmentName);
- }
requestMatched = isRequestLoggable(operation);
}
@@ -665,10 +660,7 @@
}
catch (final DirectoryException e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
}
}
@@ -687,10 +679,7 @@
}
catch (final DirectoryException e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
}
}
@@ -1169,7 +1158,7 @@
/**
* The tracer object for the debug logger.
*/
- protected static final DebugTracer TRACER = getTracer();
+ protected static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private AccessLogPublisherCfg cfg = null;
private Filter filter = null;
private final ChangeListener changeListener = new ChangeListener();
--
Gitblit v1.10.0