From 172f9ff26c2a07363b37ea83bdaba4ac6ef70226 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 18 Mar 2011 21:00:33 +0000
Subject: [PATCH] Fix issue opendj-92: improve replication thread names

---
 opends/src/server/org/opends/server/replication/service/ReplicationBroker.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index cec9b3d..f9335fb 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -2247,12 +2247,16 @@
     // Start a heartbeat monitor thread.
     if (heartbeatInterval > 0)
     {
-      heartbeatMonitor =
-        new HeartbeatMonitor("Replication Heartbeat Monitor on RS " +
-        getReplicationServer() + " " + rsServerId + " for " + baseDn +
-        " in DS " + serverId,
-        session, heartbeatInterval, (protocolVersion >=
-        ProtocolVersion.REPLICATION_PROTOCOL_V4));
+      String threadName = "Replica DS("
+          + this.getServerId() + ") heartbeat monitor for domain \""
+          + this.baseDn + "\" from RS(" + this.getRsServerId()
+          + ") at " + session.getReadableRemoteAddress();
+
+      heartbeatMonitor = new HeartbeatMonitor(
+          threadName,
+          session,
+          heartbeatInterval,
+          (protocolVersion >= ProtocolVersion.REPLICATION_PROTOCOL_V4));
       heartbeatMonitor.start();
     }
   }
@@ -3142,11 +3146,15 @@
     // Start a CN heartbeat thread.
     if (changeTimeHeartbeatSendInterval > 0)
     {
-      ctHeartbeatPublisherThread =
-        new CTHeartbeatPublisherThread(
-        "Replication CN Heartbeat sender for " +
-        baseDn + " with " + getReplicationServer(),
-        session, changeTimeHeartbeatSendInterval, serverId);
+      String threadName = "Replica DS("
+          + this.getServerId()
+          + ") change time heartbeat publisher for domain \""
+          + this.baseDn + "\" to RS(" + this.getRsServerId()
+          + ") at " + session.getReadableRemoteAddress();
+
+      ctHeartbeatPublisherThread = new CTHeartbeatPublisherThread(
+          threadName, session, changeTimeHeartbeatSendInterval,
+          serverId);
       ctHeartbeatPublisherThread.start();
     } else
     {

--
Gitblit v1.10.0