From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
index 91811fc..fb3a347 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
@@ -32,14 +32,12 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.DirectoryThread;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.CancelRequest;
-import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.Operation;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -51,10 +49,7 @@
public class TraditionalWorkerThread
extends DirectoryThread
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* Indicates whether the Directory Server is shutting down and this thread
@@ -169,13 +164,13 @@
}
catch (Throwable t)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugWarning(
+ logger.trace(
"Uncaught exception in worker thread while processing " +
"operation %s: %s", String.valueOf(operation), t);
- TRACER.debugCaught(DebugLogLevel.ERROR, t);
+ logger.traceException(t);
}
try
@@ -193,13 +188,13 @@
}
catch (Throwable t2)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugWarning(
+ logger.trace(
"Exception in worker thread while trying to log a " +
"message about an uncaught exception %s: %s", t, t2);
- TRACER.debugCaught(DebugLogLevel.ERROR, t2);
+ logger.traceException(t2);
}
}
@@ -215,10 +210,7 @@
}
catch (Throwable t2)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, t2);
- }
+ logger.traceException(t2);
}
}
}
@@ -236,9 +228,9 @@
}
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(getName() + " exiting.");
+ logger.trace(getName() + " exiting.");
}
}
@@ -250,9 +242,9 @@
*/
public void shutDown()
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugInfo(getName() + " being signaled to shut down.");
+ logger.trace(getName() + " being signaled to shut down.");
}
// Set a flag that indicates that the thread should stop running.
@@ -269,12 +261,12 @@
}
catch (Exception e)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugWarning(
+ logger.trace(
"Caught an exception while trying to interrupt the worker " +
"thread waiting for work: %s", e);
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
}
}
}
@@ -292,12 +284,12 @@
}
catch (Exception e)
{
- if (debugEnabled())
+ if (logger.isTraceEnabled())
{
- TRACER.debugWarning(
+ logger.trace(
"Caught an exception while trying to abandon the " +
"operation in progress for the worker thread: %s", e);
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ logger.traceException(e);
}
}
}
--
Gitblit v1.10.0