From b0a7e3cf4a65ea95c79cf002596428d0aed2e26e Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 22 May 2007 23:30:15 +0000
Subject: [PATCH] Remove the dependence on AspectJ for all non method-entry and method-exit related debug messages. All debug statements will now work w/o weaving enabled. However, method-entry and method-exit debug messages work only with weaving enabled.
---
opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java b/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
index 767d197..c040325 100644
--- a/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HeartbeatMonitor.java
@@ -27,8 +27,8 @@
package org.opends.server.replication.plugin;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import java.io.IOException;
@@ -41,6 +41,11 @@
*/
public class HeartbeatMonitor extends DirectoryThread
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
/**
@@ -94,7 +99,7 @@
{
if (debugEnabled())
{
- debugInfo("Heartbeat monitor is starting, expected interval is %d",
+ TRACER.debugInfo("Heartbeat monitor is starting, expected interval is %d",
heartbeatInterval);
}
try
@@ -105,14 +110,14 @@
long lastReceiveTime = session.getLastReceiveTime();
if (now > lastReceiveTime + 2 * heartbeatInterval)
{
- debugInfo("Heartbeat monitor is closing the broker session " +
+ TRACER.debugInfo("Heartbeat monitor is closing the broker session " +
"because it could not detect a heartbeat.");
// Heartbeat is well overdue so the server is assumed to be dead.
if (debugEnabled())
{
- debugInfo("Heartbeat monitor is closing the broker session " +
- "because it could not detect a heartbeat.");
+ TRACER.debugInfo("Heartbeat monitor is closing the broker " +
+ "session because it could not detect a heartbeat.");
}
session.close();
break;
@@ -135,7 +140,7 @@
{
if (debugEnabled())
{
- debugInfo("Heartbeat monitor is exiting.");
+ TRACER.debugInfo("Heartbeat monitor is exiting.");
}
}
}
--
Gitblit v1.10.0