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/backends/jeb/RootContainer.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/RootContainer.java b/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
index f4714b7..73a582e 100644
--- a/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -45,9 +45,8 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
import static org.opends.server.loggers.ErrorLogger.logError;
-import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
-import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.*;
import org.opends.server.api.Backend;
@@ -63,6 +62,11 @@
public class RootContainer
implements ConfigurationChangeListener<JEBackendCfg>
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
/**
* The JE database environment.
@@ -156,9 +160,9 @@
if (debugEnabled())
{
- debugInfo("JE (%s) environment opened with the following config: %n%s",
- JEVersion.CURRENT_VERSION.toString(),
- env.getConfig().toString());
+ TRACER.debugInfo("JE (%s) environment opened with the following " +
+ "config: %n%s", JEVersion.CURRENT_VERSION.toString(),
+ env.getConfig().toString());
// Get current size of heap in bytes
long heapSize = Runtime.getRuntime().totalMemory();
@@ -172,9 +176,9 @@
// after garbage collection and decrease as new objects are created.
long heapFreeSize = Runtime.getRuntime().freeMemory();
- debugInfo("Current size of heap: %d bytes", heapSize);
- debugInfo("Max size of heap: %d bytes", heapMaxSize);
- debugInfo("Free memory in heap: %d bytes", heapFreeSize);
+ TRACER.debugInfo("Current size of heap: %d bytes", heapSize);
+ TRACER.debugInfo("Max size of heap: %d bytes", heapMaxSize);
+ TRACER.debugInfo("Free memory in heap: %d bytes", heapFreeSize);
}
}
@@ -386,7 +390,7 @@
if(debugEnabled())
{
- debugInfo("file=" + db.getDatabaseName() +
+ TRACER.debugInfo("file=" + db.getDatabaseName() +
" LNs=" + preloadStats.getNLNsLoaded());
}
@@ -410,7 +414,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
}
}
@@ -673,7 +677,7 @@
}
if(debugEnabled())
{
- debugInfo("The change to the following property will " +
+ TRACER.debugInfo("The change to the following property will " +
"take effect when the backend is restarted: " +
param.getName());
}
@@ -687,7 +691,7 @@
if (debugEnabled())
{
- debugInfo(env.getConfig().toString());
+ TRACER.debugInfo(env.getConfig().toString());
}
}
catch (Exception e)
--
Gitblit v1.10.0