From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +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/plugin/PersistentServerState.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
index c170a5a..ae2317d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/PersistentServerState.java
@@ -27,6 +27,7 @@
package org.opends.server.replication.plugin;
import java.util.ArrayList;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -43,7 +44,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* This class implements a ServerState that is stored in the backend
@@ -52,6 +52,9 @@
*/
public class PersistentServerState
{
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private final DN baseDn;
private final InternalClientConnection conn =
InternalClientConnection.getRootConnection();
@@ -189,10 +192,8 @@
if (((search.getResultCode() != ResultCode.SUCCESS)) &&
((search.getResultCode() != ResultCode.NO_SUCH_OBJECT)))
{
- LocalizableMessage message = ERR_ERROR_SEARCHING_RUV.
- get(search.getResultCode().getResultCodeName(), search.toString(),
+ logger.error(ERR_ERROR_SEARCHING_RUV, search.getResultCode().getResultCodeName(), search.toString(),
search.getErrorMessage(), baseDn.toString());
- logError(message);
return null;
}
@@ -335,12 +336,10 @@
op.run();
if (op.getResultCode() != ResultCode.SUCCESS)
{
- LocalizableMessage message = DEBUG_ERROR_UPDATING_RUV.get(
- op.getResultCode().getResultCodeName().toString(),
+ logger.trace(DEBUG_ERROR_UPDATING_RUV, op.getResultCode().getResultCodeName().toString(),
op.toString(),
op.getErrorMessage().toString(),
baseDn.toString());
- logError(message);
}
return op.getResultCode();
}
@@ -406,9 +405,7 @@
{
// An error happened trying to search for the updates
// Log an error
- message = ERR_CANNOT_RECOVER_CHANGES.get(
- baseDn.toNormalizedString());
- logError(message);
+ logger.error(ERR_CANNOT_RECOVER_CHANGES, baseDn.toNormalizedString());
}
else
{
@@ -438,9 +435,7 @@
// Update the serverState with the new maxCsn
// present in the database
this.update(dbMaxCsn);
- message = NOTE_SERVER_STATE_RECOVERY.get(
- baseDn.toNormalizedString(), dbMaxCsn.toString());
- logError(message);
+ logger.info(NOTE_SERVER_STATE_RECOVERY, baseDn.toNormalizedString(), dbMaxCsn.toString());
}
}
}
--
Gitblit v1.10.0