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/replication/server/ServerReader.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
index 6913fce..f2b3547 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
@@ -30,13 +30,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.DirectoryThread;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.ServerStatus;
import org.opends.server.replication.protocol.*;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.replication.common.ServerStatus.*;
import static org.opends.server.util.StaticUtils.*;
@@ -52,11 +51,7 @@
*/
public class ServerReader extends DirectoryThread
{
-
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private final Session session;
private final ServerHandler handler;
@@ -84,9 +79,9 @@
public void run()
{
LocalizableMessage errMessage = null;
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(getName() + " starting");
+ logger.trace(getName() + " starting");
}
/*
* wait on input stream
@@ -101,8 +96,8 @@
{
ReplicationMsg msg = session.receive();
- if (debugEnabled())
- TRACER.debugInfo("In " + getName() + " receives " + msg);
+ if (logger.isTraceEnabled())
+ logger.trace("In " + getName() + " receives " + msg);
if (msg instanceof AckMsg)
{
@@ -217,9 +212,9 @@
{
// Peer server is properly disconnecting: go out of here to
// properly close the server handler going to finally block.
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(handler
+ logger.trace(handler
+ " has properly disconnected from this replication server "
+ handler.getReplicationServerId());
}
@@ -273,23 +268,23 @@
* The thread only exits the loop above if some error condition happen.
* Attempt to close the socket and stop the server handler.
*/
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo("In " + getName() + " closing the session");
+ logger.trace("In " + getName() + " closing the session");
}
session.close();
handler.doStop();
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(getName() + " stopped: " + errMessage);
+ logger.trace(getName() + " stopped: " + errMessage);
}
}
}
private void logException(Exception e)
{
- if (debugEnabled())
- TRACER.debugInfo(
+ if (logger.isTraceEnabled())
+ logger.trace(
"In " + getName() + " " + stackTraceToSingleLineString(e));
}
}
--
Gitblit v1.10.0