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/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
index 00aef72..f8d49db 100644
--- a/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
+++ b/opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -27,13 +27,9 @@
package org.opends.server.snmp;
import com.sun.management.comm.CommunicatorServer;
+
import java.io.File;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.DebugTracer;
-import org.opends.server.types.DebugLogLevel;
-
-import static org.opends.server.loggers.debug.DebugLogger.*;
import com.sun.management.comm.SnmpV3AdaptorServer;
import com.sun.management.snmp.InetAddressAcl;
@@ -43,9 +39,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.SortedSet;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.forgerock.i18n.LocalizableMessage;
+
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
@@ -54,17 +52,14 @@
import org.forgerock.util.Reject;
import static org.opends.messages.ProtocolMessages.*;
-import static org.opends.server.loggers.ErrorLogger.*;
/**
* The SNMPClassLoaderProvider.
*/
public class SNMPClassLoaderProvider {
- /**
- * The debug log tracer for this class.
- */
- private static final DebugTracer TRACER = DebugLogger.getTracer();
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/**
* The current configuration state.
*/
@@ -180,9 +175,7 @@
}
}
} catch (Exception ex) {
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
}
// Check if the security file
@@ -262,9 +255,7 @@
this.currentConfig.getTrapsDestination());
if (this.sentTraps == false) {
- LocalizableMessage message =
- ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS.get();
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_NO_VALID_TRAP_DESTINATIONS);
} else {
// Send a coldStart SNMP Trap.
this.snmpAdaptor.setTrapPort(snmpTrapPort);
@@ -309,7 +300,7 @@
0,
null);
}
- String[] names = this.snmpAdaptor.getMibs();
+ this.snmpAdaptor.getMibs();
// Stop the SNMP Adaptor
this.snmpAdaptor.stop();
@@ -331,9 +322,7 @@
this.server.unregisterMBean(this.UsmObjName);
}
} catch (Exception ex) {
- if (debugEnabled()) {
- TRACER.debugCaught(DebugLogLevel.ERROR, ex);
- }
+ logger.traceException(ex);
}
}
@@ -367,12 +356,12 @@
engineParameters.activateEncryption();
// Create the UACL controller
- UserAcl uacls = (UserAcl) new SNMPUserAcl(configuration);
+ UserAcl uacls = new SNMPUserAcl(configuration);
engineParameters.setUserAcl(uacls);
// V1/V2 Security parameters
InetAddressAcl acls =
- (InetAddressAcl) new SNMPInetAddressAcl(configuration);
+ new SNMPInetAddressAcl(configuration);
adaptor = new SnmpV3AdaptorServer(engineParameters, null, acls,
configuration.getListenPort(), null);
@@ -382,7 +371,7 @@
return adaptor;
} catch (Exception ex) {
- TRACER.debugError("Could not instanciate the SNMP Adaptor");
+ logger.trace("Could not instanciate the SNMP Adaptor");
return null;
}
}
@@ -397,12 +386,10 @@
boolean found = false;
for (String dest : destinations) {
try {
- InetAddress addr = InetAddress.getByName(dest);
+ InetAddress.getByName(dest);
found = true;
} catch (UnknownHostException ex) {
- LocalizableMessage message = ERR_SNMP_CONNHANDLER_TRAPS_DESTINATION.get(
- dest);
- logError(message);
+ logger.error(ERR_SNMP_CONNHANDLER_TRAPS_DESTINATION, dest);
}
}
return found;
--
Gitblit v1.10.0