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/server/ReplicationServer.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index daa1af6..45b969a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -57,7 +57,6 @@
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -196,7 +195,7 @@
getServerId(),
listenSocket.getInetAddress().getHostAddress(),
listenSocket.getLocalPort());
- logError(listenMsg);
+ logger.error(listenMsg);
while (!shutdown && !stopListen)
{
@@ -267,9 +266,7 @@
// Do not log the message during shutdown.
logger.traceException(e);
if (!shutdown) {
- LocalizableMessage message =
- ERR_EXCEPTION_LISTENING.get(e.getLocalizedMessage());
- logError(message);
+ logger.error(ERR_EXCEPTION_LISTENING, e.getLocalizedMessage());
}
}
}
@@ -430,12 +427,10 @@
" successfully initialized");
} catch (UnknownHostException e)
{
- logError(ERR_UNKNOWN_HOSTNAME.get());
+ logger.error(ERR_UNKNOWN_HOSTNAME.get());
} catch (IOException e)
{
- LocalizableMessage message = ERR_COULD_NOT_BIND_CHANGELOG.get(
- getReplicationPort(), e.getMessage());
- logError(message);
+ logger.error(ERR_COULD_NOT_BIND_CHANGELOG, getReplicationPort(), e.getMessage());
} catch (DirectoryException e)
{
//FIXME:DirectoryException is raised by initializeECL => fix err msg
@@ -443,7 +438,7 @@
LocalizableMessage
.raw("Directory Exception raised by ECL initialization: "
+ e.getMessage());
- logError(message);
+ logger.error(message);
}
}
@@ -811,13 +806,13 @@
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
+ logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
}
catch (InterruptedException e)
{
if (logger.isTraceEnabled())
logger.traceException(e);
- logError(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
+ logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
}
}
@@ -1048,7 +1043,7 @@
LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
mb.append(e.getLocalizedMessage());
LocalizableMessage msg = ERR_DELETE_REPL_BACKEND_FAILED.get(mb.toString());
- logError(msg);
+ logger.error(msg);
}
}
--
Gitblit v1.10.0