From 8bdfb229e4b8789bb1954fa0da8c1098c382bd4e Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Tue, 10 Mar 2009 08:56:32 +0000
Subject: [PATCH] fix for 3804 : improve replication monitoring
---
opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java b/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
index ccbf43f..b4634fc 100644
--- a/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/LightweightServerHandler.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
@@ -203,9 +203,9 @@
public String getMonitorInstanceName()
{
String serverURL=""; // FIXME
- String str = rsDomain.getBaseDn().toString() + " " + serverURL + " "
- + String.valueOf(serverId);
- return "Undirect LDAP Server " + str;
+ String str = serverURL + " " + String.valueOf(serverId);
+ return "Undirect Replica " + str +
+ ",cn=" + replServerHandler.getMonitorInstanceName();
}
/**
@@ -253,7 +253,7 @@
attributes.add(Attributes.create("server-id",
String.valueOf(serverId)));
- attributes.add(Attributes.create("base-dn",
+ attributes.add(Attributes.create("domain-name",
rsDomain.getBaseDn()));
attributes.add(Attributes.create("connected-to",
replServerHandler.getMonitorInstanceName()));
@@ -262,7 +262,7 @@
MonitorData md;
try
{
- md = rsDomain.getMonitorData();
+ md = rsDomain.computeMonitorData();
ServerState remoteState = md.getLDAPServerState(serverId);
if (remoteState == null)
--
Gitblit v1.10.0