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/DataServerHandler.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
index 1e49d56..9f11db2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -35,7 +35,6 @@
import org.opends.server.types.*;
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.replication.common.StatusMachine.*;
import static org.opends.server.replication.protocol.ProtocolVersion.*;
@@ -131,9 +130,9 @@
if (status != ServerStatus.BAD_GEN_ID_STATUS)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo("In RS " + replicationServer.getServerId()
+ logger.trace("In RS " + replicationServer.getServerId()
+ ", DS " + getServerId() + " for baseDN=" + getBaseDNString()
+ " has already generation id " + newGenId
+ " so no ChangeStatusMsg sent to him.");
@@ -145,9 +144,9 @@
// Close connection with him to force his reconnection: DS will
// reconnect in NORMAL_STATUS or DEGRADED_STATUS.
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo("In RS " + replicationServer.getServerId()
+ logger.trace("In RS " + replicationServer.getServerId()
+ ", closing connection to DS " + getServerId() + " for baseDN="
+ getBaseDNString() + " to force reconnection as new local"
+ " generationId and remote one match and DS is in bad gen id: "
@@ -214,9 +213,9 @@
// Send message requesting to change the DS status
ChangeStatusMsg csMsg = new ChangeStatusMsg(newStatus, INVALID_STATUS);
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo("In RS " + replicationServer.getServerId()
+ logger.trace("In RS " + replicationServer.getServerId()
+ " Sending change status " + origin + " to " + getServerId()
+ " for baseDN=" + getBaseDNString() + ":\n" + csMsg);
}
--
Gitblit v1.10.0