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/ECLServerWriter.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
index 62f8260..447fc40 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerWriter.java
@@ -141,7 +141,6 @@
*/
public void run()
{
- Message errMessage = null;
try
{
while (true)
@@ -170,16 +169,36 @@
catch (SocketException e)
{
// Just ignore the exception and let the thread die as well
- errMessage = ERR_SERVER_BADLY_DISCONNECTED.get(handler.toString(),
- "for operation " + handler.getOperationId());
- logError(errMessage);
+ if (session != null) // This will always be the case if a socket exception
+ // has occurred.
+ {
+ Message errMessage;
+ if (handler.isDataServer())
+ {
+ errMessage = ERR_DS_BADLY_DISCONNECTED.get(
+ handler.getReplicationServerId(),
+ handler.getServerId(),
+ session.getReadableRemoteAddress(),
+ handler.getServiceId());
+ }
+ else
+ {
+ errMessage = ERR_RS_BADLY_DISCONNECTED.get(
+ handler.getReplicationServerId(),
+ handler.getServerId(),
+ session.getReadableRemoteAddress(),
+ handler.getServiceId());
+ }
+ logError(errMessage);
+ }
}
catch (Exception e)
{
// An unexpected error happened.
// Log an error and close the connection.
- errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler.toString() +
- " " + stackTraceToSingleLineString(e));
+ Message errMessage = ERR_WRITER_UNEXPECTED_EXCEPTION
+ .get(handler.toString() + " "
+ + stackTraceToSingleLineString(e));
logError(errMessage);
}
finally
--
Gitblit v1.10.0