From fd8c55f039d04514fd3acbd2eeaa24497decd8ef Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Mon, 31 Jul 2006 18:43:28 +0000
Subject: [PATCH] This is a fix for Issue 550 -- Database Environment monitor should include the backend ID.
---
opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 4 +++-
opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java | 17 +++++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index 6951609..43535be 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -409,7 +409,9 @@
}
// Create and register a monitor provider for the environment.
- MonitorProvider monitorProvider = new DatabaseEnvironmentMonitor(dbEnv);
+ String monitorName = this.getBackendID() + " Database Environment";
+ MonitorProvider monitorProvider =
+ new DatabaseEnvironmentMonitor(monitorName, dbEnv);
monitorProviders.add(monitorProvider);
DirectoryServer.registerMonitorProvider(monitorProvider);
diff --git a/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index 4d1a8eb..96942d3 100644
--- a/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -64,19 +64,29 @@
"org.opends.server.monitors.DatabaseEnvironmentMonitor";
+ /**
+ * The name of this monitor instance.
+ */
+ private String name;
+
+ /**
+ * The JE environment handle to be monitored.
+ */
private Environment environment;
/**
* Creates a new database environment monitor.
+ * @param name The monitor instance name.
* @param environment A JE environment handle for the database to be
* monitored.
*/
- public DatabaseEnvironmentMonitor(Environment environment)
+ public DatabaseEnvironmentMonitor(String name, Environment environment)
{
- super("Database Environment Monitor Provider");
+ super(name + " Monitor Provider");
assert debugConstructor(CLASS_NAME);
+ this.name = name;
this.environment = environment;
}
@@ -109,8 +119,7 @@
*/
public String getMonitorInstanceName()
{
- // FIXME: support multiple environments
- return "Database Environment";
+ return name;
}
/**
--
Gitblit v1.10.0