From 39be274a446bc48400fb0f4ff8ec74b54883f7a6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 12 Feb 2014 10:55:00 +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/tools/LDAPConnection.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
index c85c6b2..70495fe 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPConnection.java
@@ -34,8 +34,7 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Logger;
+import java.util.logging.Level;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.controls.AuthorizationIdentityResponseControl;
@@ -43,7 +42,7 @@
import org.opends.server.controls.PasswordPolicyErrorType;
import org.opends.server.controls.PasswordPolicyResponseControl;
import org.opends.server.controls.PasswordPolicyWarningType;
-import org.opends.server.loggers.JdkLoggingFormater;
+import org.opends.server.loggers.JDKLogging;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
@@ -182,13 +181,15 @@
ArrayList<Control> requestControls = new ArrayList<Control> ();
ArrayList<Control> responseControls = new ArrayList<Control> ();
- if(connectionOptions.isVerbose())
+ if (connectionOptions.isVerbose())
{
- Logger logger = Logger.getLogger("org.opends");
- ConsoleHandler handler = new ConsoleHandler();
- handler.setFormatter(new JdkLoggingFormater());
- logger.addHandler(handler);
+ JDKLogging.enableConsoleLoggingForOpenDJ(Level.ALL);
}
+ else
+ {
+ JDKLogging.disableLogging();
+ }
+
if(connectionOptions.useStartTLS())
{
--
Gitblit v1.10.0