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/loggers/FreeDiskSpaceRetentionPolicy.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index b3cc34e..c6ee347 100644
--- a/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -32,9 +32,8 @@
import java.util.ArrayList;
import java.util.List;
-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.debugInfo;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.ResultCode;
import org.opends.server.types.ConfigChangeResult;
@@ -50,6 +49,11 @@
RetentionPolicy<FreeDiskSpaceLogRetentionPolicyCfg>,
ConfigurationChangeListener<FreeDiskSpaceLogRetentionPolicyCfg>
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
private long freeDiskSpace = 0;
@@ -121,14 +125,14 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
return 0;
}
if(debugEnabled())
{
- debugInfo("Current free disk space: %d, Required: %d", freeSpace,
+ TRACER.debugInfo("Current free disk space: %d, Required: %d", freeSpace,
freeDiskSpace);
}
@@ -149,7 +153,7 @@
freedSpace += files[j].length();
if(debugEnabled())
{
- debugInfo("Deleting log file:", files[j]);
+ TRACER.debugInfo("Deleting log file:", files[j]);
}
files[j].delete();
if (freedSpace >= freeSpaceNeeded)
--
Gitblit v1.10.0