From 4893e6fa252c6524fc1834e1ed120899304b09e1 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 04 May 2007 00:55:16 +0000
Subject: [PATCH] Update the default access logger to provide additional more information in some cases:

---
 opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java |  132 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 132 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index cc8ac75..06b3a6b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -529,6 +529,14 @@
       buffer.append("\"");
     }
 
+    msg = abandonOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append(" additionalInfo=\"");
+      buffer.append(msg);
+      buffer.append("\"");
+    }
+
     buffer.append(" etime=");
     buffer.append(abandonOperation.getProcessingTime());
 
@@ -602,6 +610,20 @@
       buffer.append(msg);
     }
 
+    msg = addOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    DN proxiedAuthDN = addOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append("\" etime=");
     buffer.append(addOperation.getProcessingTime());
 
@@ -706,6 +728,37 @@
       }
     }
 
+    msg = bindOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    if (bindOperation.getResultCode() == ResultCode.SUCCESS)
+    {
+      AuthenticationInfo authInfo = bindOperation.getAuthenticationInfo();
+      if (authInfo != null)
+      {
+        DN authDN = authInfo.getAuthenticationDN();
+        buffer.append("\" authDN=\"");
+        if (authDN != null)
+        {
+          authDN.toString(buffer);
+
+          DN authzDN = authInfo.getAuthorizationDN();
+          if (! authDN.equals(authzDN))
+          {
+            buffer.append("\" authzDN=\"");
+            if (authzDN != null)
+            {
+              authzDN.toString(buffer);
+            }
+          }
+        }
+      }
+    }
+
     buffer.append("\" etime=");
     buffer.append(bindOperation.getProcessingTime());
 
@@ -780,6 +833,20 @@
       buffer.append(msg);
     }
 
+    msg = compareOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    DN proxiedAuthDN = compareOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append("\" etime=");
     buffer.append(compareOperation.getProcessingTime());
 
@@ -854,6 +921,20 @@
       buffer.append(msg);
     }
 
+    msg = deleteOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    DN proxiedAuthDN = deleteOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append("\" etime=");
     buffer.append(deleteOperation.getProcessingTime());
 
@@ -938,6 +1019,13 @@
       buffer.append(msg);
     }
 
+    msg = extendedOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
     buffer.append("\" etime=");
     buffer.append(extendedOperation.getProcessingTime());
 
@@ -1013,6 +1101,20 @@
       buffer.append(msg);
     }
 
+    msg = modifyOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    DN proxiedAuthDN = modifyOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append("\" etime=");
     buffer.append(modifyOperation.getProcessingTime());
 
@@ -1099,6 +1201,20 @@
       buffer.append(msg);
     }
 
+    msg = modifyDNOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append("\" additionalInfo=\"");
+      buffer.append(msg);
+    }
+
+    DN proxiedAuthDN = modifyDNOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append("\" etime=");
     buffer.append(modifyDNOperation.getProcessingTime());
 
@@ -1230,6 +1346,22 @@
 
     buffer.append("\" nentries=");
     buffer.append(searchOperation.getEntriesSent());
+
+    msg = searchOperation.getAdditionalLogMessage();
+    if ((msg != null) && (msg.length() > 0))
+    {
+      buffer.append(" additionalInfo=\"");
+      buffer.append(msg);
+      buffer.append("\"");
+    }
+
+    DN proxiedAuthDN = searchOperation.getProxiedAuthorizationDN();
+    if (proxiedAuthDN != null)
+    {
+      buffer.append("\" authzDN=\"");
+      proxiedAuthDN.toString(buffer);
+    }
+
     buffer.append(" etime=");
     buffer.append(searchOperation.getProcessingTime());
 

--
Gitblit v1.10.0