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/tools/LDAPReader.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
index 902e729..0114cfd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
@@ -30,12 +30,9 @@
import org.opends.server.protocols.asn1.*;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.RecordingInputStream;
import org.forgerock.opendj.ldap.ByteString;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.getTracer;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.util.ServerConstants;
import java.io.IOException;
@@ -47,10 +44,7 @@
*/
public class LDAPReader
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private Socket socket;
private ASN1Reader asn1Reader;
@@ -91,7 +85,7 @@
public LDAPMessage readMessage()
throws IOException, ASN1Exception, LDAPException
{
- debugInputStream.setRecordingEnabled(debugEnabled());
+ debugInputStream.setRecordingEnabled(logger.isTraceEnabled());
if(!asn1Reader.hasNextElement())
{
@@ -114,8 +108,8 @@
builder.append(ServerConstants.EOL);
builder.append(bytesRead.toHexPlusAsciiString(4));
- TRACER.debugProtocolElement(DebugLogLevel.VERBOSE, builder.toString());
- TRACER.debugProtocolElement(DebugLogLevel.VERBOSE, message.toString());
+ logger.trace(builder.toString());
+ logger.trace(message.toString());
}
return message;
@@ -132,10 +126,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
if (socket != null)
@@ -146,10 +137,7 @@
}
catch (Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
}
}
--
Gitblit v1.10.0