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/ErrorLogger.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/ErrorLogger.java b/opends/src/server/org/opends/server/loggers/ErrorLogger.java
index 656b072..4d2fd39 100644
--- a/opends/src/server/org/opends/server/loggers/ErrorLogger.java
+++ b/opends/src/server/org/opends/server/loggers/ErrorLogger.java
@@ -47,6 +47,7 @@
import org.opends.server.core.DirectoryServer;
import static org.opends.server.loggers.debug.DebugLogger.*;
+import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -61,6 +62,11 @@
ConfigurationDeleteListener<ErrorLogPublisherCfg>,
ConfigurationChangeListener<ErrorLogPublisherCfg>
{
+ /**
+ * The tracer object for the debug logger.
+ */
+ private static final DebugTracer TRACER = getTracer();
+
// The set of error loggers that have been registered with the server. It
// will initially be empty.
private static ConcurrentHashMap<DN, ErrorLogPublisher> errorPublishers =
@@ -193,7 +199,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
messages.add(e.getMessage());
resultCode = DirectoryServer.getServerErrorResultCode();
@@ -202,7 +208,7 @@
{
if (debugEnabled())
{
- debugCaught(DebugLogLevel.ERROR, e);
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
int msgID = MSGID_CONFIG_LOGGER_CANNOT_CREATE_LOGGER;
messages.add(getMessage(msgID, String.valueOf(config.dn().toString()),
--
Gitblit v1.10.0