From 455897cc245b67d929f409a93cfa7106e835cc1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 01 Mar 2007 03:27:06 +0000
Subject: [PATCH] This removes old debug logging framework method calls that are going to be automatically instrumented by AspectJ. Non instrumented debug method calls are updated to use the new debug framework methods. However, the new debug logging framework is not yet active as the Aspects are not weaved in. After this revision, debug logging will be disabled in the server until the new AOP framework is complete.
---
opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java b/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
index b372e86..60da8f4 100644
--- a/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
@@ -42,7 +42,9 @@
import org.opends.server.types.InitializationException;
import org.opends.server.util.DynamicConstants;
-import static org.opends.server.loggers.Debug.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import org.opends.server.types.DebugLogLevel;
@@ -53,11 +55,6 @@
public class VersionMonitorProvider
extends MonitorProvider
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.monitors.VersionMonitorProvider";
@@ -90,8 +87,6 @@
public void initializeMonitorProvider(ConfigEntry configEntry)
throws ConfigException, InitializationException
{
- assert debugEnter(CLASS_NAME, "initializeMonitorProvider",
- String.valueOf(configEntry));
// No initialization is required.
}
@@ -106,7 +101,6 @@
*/
public String getMonitorInstanceName()
{
- assert debugEnter(CLASS_NAME, "getMonitorInstanceName");
return "Version";
}
@@ -124,7 +118,6 @@
*/
public long getUpdateInterval()
{
- assert debugEnter(CLASS_NAME, "getUpdateInterval");
// This monitor does not need to run periodically.
return 0;
@@ -141,7 +134,6 @@
*/
public void updateMonitorData()
{
- assert debugEnter(CLASS_NAME, "updateMonitorData");
// This monitor does not need to run periodically.
return;
@@ -159,7 +151,6 @@
*/
public ArrayList<Attribute> getMonitorData()
{
- assert debugEnter(CLASS_NAME, "getMonitorData");
ArrayList<Attribute> attrs = new ArrayList<Attribute>(8);
@@ -196,8 +187,6 @@
*/
private Attribute createAttribute(String name, String value)
{
- assert debugEnter(CLASS_NAME, "createAttribute", String.valueOf(name),
- String.valueOf(value));
AttributeType attrType = DirectoryServer.getDefaultAttributeType(name);
@@ -211,7 +200,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "createAttribute", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
values.add(new AttributeValue(encodedValue, encodedValue));
}
--
Gitblit v1.10.0