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/MultifileTextWriter.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
index ef50064..540d8a3 100644
--- a/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -36,9 +36,8 @@
import org.opends.server.util.TimeThread;
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
-import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
-import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
-import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.LoggerMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.loggers.ErrorLogger.*;
@@ -61,6 +60,11 @@
implements ServerShutdownListener, TextWriter,
ConfigurationChangeListener<SizeLimitLogRotationPolicyCfg>
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
private static final String UTF8_ENCODING= "UTF-8";
private CopyOnWriteArrayList<RotationPolicy> rotationPolicies =
@@ -264,6 +268,8 @@
sizePolicy.currentConfig.removeSizeLimitChangeListener(this);
}
}
+
+ this.rotationPolicies.clear();
}
/**
@@ -406,7 +412,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
}
@@ -430,7 +436,7 @@
}
if (debugEnabled())
{
- debugVerbose("%d files deleted by rentention policy",
+ TRACER.debugVerbose("%d files deleted by rentention policy",
numFilesDeleted);
}
}
@@ -570,6 +576,10 @@
}
catch(Exception e)
{
+ if(debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
errorHandler.handleCloseError(e);
}
@@ -584,6 +594,10 @@
}
catch (Exception e)
{
+ if(debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
errorHandler.handleOpenError(currentFile, e);
}
@@ -591,6 +605,12 @@
// new RotationActionThread(newFile, actions, configEntry);
//rotThread.start();
+ if(debugEnabled())
+ {
+ TRACER.debugInfo("Log file %s rotated and renamed to %s",
+ currentFile, newFile);
+ }
+
totalFilesRotated++;
lastRotationTime = TimeThread.getTime();
}
--
Gitblit v1.10.0