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/replication/server/changelog/je/JEChangelogDB.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
index 2cdd857..7783f99 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.config.ConfigException;
-import org.opends.server.loggers.debug.DebugTracer;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;
import org.opends.server.replication.protocol.UpdateMsg;
@@ -44,14 +44,12 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.api.*;
import org.opends.server.types.DN;
-import org.opends.server.types.DebugLogLevel;
import org.opends.server.util.StaticUtils;
import com.forgerock.opendj.util.Pair;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -60,7 +58,7 @@
public class JEChangelogDB implements ChangelogDB, ReplicationDomainDB
{
/** The tracer object for the debug logger. */
- protected static final DebugTracer TRACER = getTracer();
+ protected static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* This map contains the List of updates received from each LDAP server.
@@ -161,8 +159,8 @@
}
catch (Exception e)
{
- if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (logger.isTraceEnabled())
+ logger.traceException(e);
final LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(e.getLocalizedMessage());
@@ -322,8 +320,8 @@
}
catch (ChangelogException e)
{
- if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (logger.isTraceEnabled())
+ logger.traceException(e);
logError(ERR_COULD_NOT_READ_DB.get(this.dbDirectory.getAbsolutePath(),
e.getLocalizedMessage()));
@@ -467,8 +465,8 @@
{
firstException = e;
}
- else if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ else if (logger.isTraceEnabled())
+ logger.traceException(e);
}
cnIndexDB = null;
@@ -589,8 +587,8 @@
{
firstException = e;
}
- else if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ else if (logger.isTraceEnabled())
+ logger.traceException(e);
}
}
}
@@ -606,8 +604,8 @@
{
firstException = e;
}
- else if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ else if (logger.isTraceEnabled())
+ logger.traceException(e);
}
if (firstException != null)
@@ -704,8 +702,8 @@
}
catch (Exception e)
{
- if (debugEnabled())
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ if (logger.isTraceEnabled())
+ logger.traceException(e);
logError(ERR_CHANGENUMBER_DATABASE.get(e.getLocalizedMessage()));
}
}
--
Gitblit v1.10.0