From 96eaa516a85e620a6b76a64ffbe71cdc6037e026 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 13 Apr 2011 16:23:40 +0000
Subject: [PATCH] Initial fix for OpenDJ-97: Very many minor problems with the error logging for replication
---
opends/src/server/org/opends/server/replication/server/DataServerHandler.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
index c7c3b2a..a32519c 100644
--- a/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -560,6 +560,12 @@
registerIntoDomain();
+ Message message = INFO_REPLICATION_SERVER_CONNECTION_FROM_DS
+ .get(getReplicationServerId(), getServerId(),
+ replicationServerDomain.getBaseDn(),
+ session.getReadableRemoteAddress());
+ logError(message);
+
super.finalizeStart();
}
@@ -736,11 +742,10 @@
{
if (generationId != localGenerationId)
{
- Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
- getServiceId(),
- Integer.toString(serverId),
- Long.toString(generationId),
- Long.toString(localGenerationId));
+ Message message = WARN_BAD_GENERATION_ID_FROM_DS.get(
+ serverId, session.getReadableRemoteAddress(),
+ generationId, getServiceId(),
+ getReplicationServerId(), localGenerationId);
logError(message);
}
}
@@ -751,11 +756,10 @@
{
// If the LDAP server has already sent changes
// it is not expected to connect to an empty RS
- Message message = NOTE_BAD_GENERATION_ID_FROM_DS.get(
- getServiceId(),
- Integer.toString(serverId),
- Long.toString(generationId),
- Long.toString(localGenerationId));
+ Message message = WARN_BAD_GENERATION_ID_FROM_DS.get(
+ serverId, session.getReadableRemoteAddress(),
+ generationId, getServiceId(),
+ getReplicationServerId(), localGenerationId);
logError(message);
}
else
--
Gitblit v1.10.0