From 19df65dd04f8f3bd8f76bdf3e061a6d242ed3c69 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 02 Oct 2013 14:39:39 +0000
Subject: [PATCH] Fix OPENDJ-176 - Use SLF4J for logging in the SDK Review CR-2404
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java | 58 +++++++++++++++++++---------------------------------------
1 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
index f7850b2..5c35ee5 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java
@@ -27,7 +27,7 @@
package org.forgerock.opendj.ldap;
-import static com.forgerock.opendj.util.StaticUtils.DEBUG_LOG;
+import static com.forgerock.opendj.util.StaticUtils.DEFAULT_LOG;
import static com.forgerock.opendj.util.StaticUtils.DEFAULT_SCHEDULER;
import static org.forgerock.opendj.ldap.ErrorResultException.*;
@@ -38,8 +38,6 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-
import com.forgerock.opendj.util.AsynchronousFutureResult;
import com.forgerock.opendj.util.ReferenceCountedObject;
import com.forgerock.opendj.util.Validator;
@@ -153,10 +151,7 @@
private synchronized void checkIfAvailable() {
if (!isOperational.get()
&& (pendingConnectFuture == null || pendingConnectFuture.isDone())) {
- if (DEBUG_LOG.isLoggable(Level.FINE)) {
- DEBUG_LOG.fine(String.format("Attempting reconnect to offline factory '%s'",
- this));
- }
+ DEFAULT_LOG.debug("Attempting reconnect to offline factory '{}'", this);
pendingConnectFuture = factory.getConnectionAsync(this);
}
}
@@ -178,11 +173,7 @@
synchronized (stateLock) {
offlineFactoriesCount++;
if (offlineFactoriesCount == 1) {
- // Enable monitoring.
- if (DEBUG_LOG.isLoggable(Level.FINE)) {
- DEBUG_LOG.fine(String.format("Starting monitoring thread"));
- }
-
+ DEFAULT_LOG.debug("Starting monitoring thread");
monitoringFuture =
scheduler.get().scheduleWithFixedDelay(new MonitorRunnable(), 0,
monitoringInterval, monitoringIntervalTimeUnit);
@@ -205,9 +196,7 @@
synchronized (stateLock) {
offlineFactoriesCount--;
if (offlineFactoriesCount == 0) {
- if (DEBUG_LOG.isLoggable(Level.FINE)) {
- DEBUG_LOG.fine(String.format("Stopping monitoring thread"));
- }
+ DEFAULT_LOG.debug("Stopping monitoring thread");
monitoringFuture.cancel(false);
monitoringFuture = null;
@@ -217,10 +206,8 @@
}
private void handleListenerException(RuntimeException e) {
- if (DEBUG_LOG.isLoggable(Level.SEVERE)) {
- DEBUG_LOG.log(Level.SEVERE,
- "A run-time error occurred while processing a load-balancer event", e);
- }
+ // TODO: I18N
+ DEFAULT_LOG.error("A run-time error occurred while processing a load-balancer event", e);
}
}
@@ -240,28 +227,21 @@
/**
* A default event listener which just logs the event.
*/
- private static final LoadBalancerEventListener DEFAULT_LISTENER =
- new LoadBalancerEventListener() {
+ private static final LoadBalancerEventListener DEFAULT_LISTENER = new LoadBalancerEventListener() {
- @Override
- public void handleConnectionFactoryOnline(ConnectionFactory factory) {
- // Transition from offline to online.
- if (DEBUG_LOG.isLoggable(Level.INFO)) {
- DEBUG_LOG.info(String.format("Connection factory'%s' is now operational",
- factory));
- }
- }
+ @Override
+ public void handleConnectionFactoryOnline(ConnectionFactory factory) {
+ // Transition from offline to online.
+ // TODO: I18N
+ DEFAULT_LOG.info("Connection factory '{}' is now operational", factory);
+ }
- @Override
- public void handleConnectionFactoryOffline(ConnectionFactory factory,
- ErrorResultException error) {
- if (DEBUG_LOG.isLoggable(Level.WARNING)) {
- DEBUG_LOG.warning(String.format(
- "Connection factory '%s' is no longer operational: %s", factory,
- error.getMessage()));
- }
- }
- };
+ @Override
+ public void handleConnectionFactoryOffline(ConnectionFactory factory, ErrorResultException error) {
+ // TODO: I18N
+ DEFAULT_LOG.warn("Connection factory '{}' is no longer operational: {}", factory, error.getMessage());
+ }
+ };
private final List<MonitoredConnectionFactory> monitoredFactories;
private final ReferenceCountedObject<ScheduledExecutorService>.Reference scheduler;
--
Gitblit v1.10.0