From f3f93c5646838c940d2aaeec33ea0aac1e715a0c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 30 Jan 2014 15:03:30 +0000
Subject: [PATCH] Logging cleanup.
---
opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java | 75 ++++++++-----------------------------
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java | 9 +---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java | 10 +---
3 files changed, 22 insertions(+), 72 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
index 37a43c5..97b0477 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
@@ -41,13 +41,13 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PersistentSearch;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.core.SearchOperation;
import org.opends.server.core.networkgroups.NetworkGroup;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
@@ -172,16 +172,8 @@
networkGroup = NetworkGroup.getDefaultNetworkGroup();
networkGroup.addConnection(this);
mustEvaluateNetworkGroup = true;
- if (logger.isTraceEnabled())
- {
- LocalizableMessage message =
- INFO_CHANGE_NETWORK_GROUP.get(
- getConnectionID(),
- "null",
- networkGroup.getID());
- logger.trace(message.toString());
- }
+ logger.trace(INFO_CHANGE_NETWORK_GROUP, getConnectionID(), null, networkGroup.getID());
}
@@ -1054,16 +1046,9 @@
if (operation == null)
{
result = privileges.contains(privilege);
- if (logger.isTraceEnabled())
- {
- DN authDN = authenticationInfo.getAuthenticationDN();
-
- LocalizableMessage message = INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGE
- .get(getConnectionID(), -1L,
- String.valueOf(authDN),
- privilege.getName(), result);
- logger.trace(message.toString());
- }
+ logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGE,
+ getConnectionID(), -1L, authenticationInfo.getAuthenticationDN(),
+ privilege.getName(), result);
}
else
{
@@ -1073,18 +1058,10 @@
!authenticationInfo.isAuthenticated())) {
result = privileges.contains(privilege) ||
DirectoryServer.isDisabled(privilege);
- if (logger.isTraceEnabled())
- {
- DN authDN = authenticationInfo.getAuthenticationDN();
-
- LocalizableMessage message =
- INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGE.get(
- getConnectionID(),
- operation.getOperationID(),
- String.valueOf(authDN),
- privilege.getName(), result);
- logger.trace(message.toString());
- }
+ logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGE,
+ getConnectionID(), operation.getOperationID(),
+ authenticationInfo.getAuthenticationDN(),
+ privilege.getName(), result);
}
else
{
@@ -1163,29 +1140,16 @@
buffer.append(" }");
+ final DN authDN = authenticationInfo.getAuthenticationDN();
if (operation == null)
{
- DN authDN = authenticationInfo.getAuthenticationDN();
-
- LocalizableMessage message =
- INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES.get(
- getConnectionID(), -1L,
- String.valueOf(authDN),
- buffer.toString(), result);
- logger.trace(
- message.toString());
+ logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES.get(
+ getConnectionID(), -1L, authDN, buffer, result));
}
else
{
- DN authDN = authenticationInfo.getAuthenticationDN();
-
- LocalizableMessage message = INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES
- .get(
- getConnectionID(),
- operation.getOperationID(),
- String.valueOf(authDN),
- buffer.toString(), result);
- logger.trace(message.toString());
+ logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES.get(
+ getConnectionID(), operation.getOperationID(), authDN, buffer, result));
}
return result;
@@ -1704,15 +1668,8 @@
public final void setNetworkGroup (NetworkGroup networkGroup)
{
if (this.networkGroup != networkGroup) {
- if (logger.isTraceEnabled())
- {
- LocalizableMessage message =
- INFO_CHANGE_NETWORK_GROUP.get(
- getConnectionID(),
- this.networkGroup.getID(),
- networkGroup.getID());
- logger.trace(message.toString());
- }
+ logger.trace(INFO_CHANGE_NETWORK_GROUP, getConnectionID(),
+ this.networkGroup.getID(), networkGroup.getID());
// If there is a change, first remove this connection
// from the current network group
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
index cd2140e..8b602f3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -39,6 +39,8 @@
import java.util.zip.CheckedInputStream;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.util.Reject;
import org.opends.server.admin.Configuration;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
@@ -51,10 +53,8 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.opends.server.extensions.DiskSpaceMonitor;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.opends.server.util.RuntimeInformation;
-import org.forgerock.util.Reject;
import com.sleepycat.je.DatabaseException;
import com.sleepycat.je.Durability;
@@ -992,11 +992,7 @@
}
// Sync the environment to disk.
- if (logger.isTraceEnabled())
- {
- LocalizableMessage message = NOTE_JEB_IMPORT_CLOSING_DATABASE.get();
- logger.trace(message.toString());
- }
+ logger.trace(NOTE_JEB_IMPORT_CLOSING_DATABASE);
}
catch (DatabaseException de)
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
index 27cc9f7..3fbe636 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexer.java
@@ -31,9 +31,8 @@
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.server.api.DirectoryThread;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.server.api.DirectoryThread;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.MultiDomainServerState;
import org.opends.server.replication.common.ServerState;
@@ -515,9 +514,8 @@
// Rely on the DirectoryThread uncaught exceptions handler
// for logging error + alert.
// LocalizableMessage logged here gives corrective information to the administrator.
- LocalizableMessage msg = ERR_CHANGE_NUMBER_INDEXER_UNEXPECTED_EXCEPTION.get(
+ logger.trace(ERR_CHANGE_NUMBER_INDEXER_UNEXPECTED_EXCEPTION,
getClass().getSimpleName(), stackTraceToSingleLineString(e));
- logger.trace(msg.toString());
throw e;
}
catch (Exception e)
@@ -526,9 +524,8 @@
// Rely on the DirectoryThread uncaught exceptions handler
// for logging error + alert.
// LocalizableMessage logged here gives corrective information to the administrator.
- LocalizableMessage msg = ERR_CHANGE_NUMBER_INDEXER_UNEXPECTED_EXCEPTION.get(
+ logger.trace(ERR_CHANGE_NUMBER_INDEXER_UNEXPECTED_EXCEPTION,
getClass().getSimpleName(), stackTraceToSingleLineString(e));
- logger.trace(msg.toString());
throw new RuntimeException(e);
}
finally
--
Gitblit v1.10.0