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/backends/jeb/Index.java | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
index 1a8a2d1..5f40a6a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java
@@ -22,12 +22,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.backends.jeb;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.loggers.ErrorLogger.*;
import com.sleepycat.je.*;
@@ -47,10 +46,7 @@
*/
public class Index extends DatabaseContainer
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* The indexer object to construct index keys from LDAP attribute values.
@@ -452,11 +448,11 @@
}
entryLimitExceededCount++;
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugInfo("Index entry exceeded in index %s. " +
+ logger.trace("Index entry exceeded in index %s. " +
"Limit: %d. ID list size: %d.\nKey:%s",
name, indexEntryLimit, entryIDList.size(),
builder.toString());
@@ -505,11 +501,11 @@
if(status != OperationStatus.SUCCESS)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError(
+ logger.trace(
"The expected key does not exist in the index %s.\nKey:%s ",
name, builder.toString());
}
@@ -561,11 +557,11 @@
{
if(deletedIDs != null && !rebuildRunning && trusted)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError(
+ logger.trace(
"The expected key does not exist in the index %s.\nKey:%s ",
name, builder.toString());
}
@@ -632,11 +628,11 @@
}
entryLimitExceededCount++;
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugInfo("Index entry exceeded in index %s. " +
+ logger.trace("Index entry exceeded in index %s. " +
"Limit: %d. ID list size: %d.\nKey:%s",
name, indexEntryLimit, idCountDelta + addedIDs.size(),
builder.toString());
@@ -684,11 +680,11 @@
{
if(deletedIDs != null && !rebuildRunning && trusted)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError(
+ logger.trace(
"The expected key does not exist in the index %s.\nKey:%s",
name, builder.toString());
}
@@ -790,11 +786,11 @@
// will probably not be rebuilt.
if(trusted && !rebuildRunning)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError(
+ logger.trace(
"The expected key does not exist in the index %s.\nKey:%s",
name, builder.toString());
}
@@ -839,11 +835,11 @@
// probably already removed.
if (!entryIDList.remove(entryID) && !rebuildRunning && trusted)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError("The expected entry ID does not exist in " +
+ logger.trace("The expected entry ID does not exist in " +
"the entry ID list for index %s.\nKey:%s",
name, builder.toString());
}
@@ -874,11 +870,11 @@
// will probably not be rebuilt.
if(trusted && !rebuildRunning)
{
- if(debugEnabled())
+ if(logger.isTraceEnabled())
{
StringBuilder builder = new StringBuilder();
StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 4);
- TRACER.debugError(
+ logger.trace(
"The expected key does not exist in the index %s.\nKey:%s",
name, builder.toString());
}
@@ -1010,10 +1006,7 @@
}
catch (DatabaseException e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
return new EntryIDSet();
}
}
@@ -1165,10 +1158,7 @@
}
catch (DatabaseException e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
return new EntryIDSet();
}
}
--
Gitblit v1.10.0