From a27123e14342027e3bd56279613a0d1b030e0bf0 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Wed, 11 Jul 2007 08:14:30 +0000
Subject: [PATCH] Fix for issue 1321 : Synchronization changes aren't logged by default
---
opends/resource/schema/02-config.ldif | 7
opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java | 78 +++++++-
opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java | 376 +++++++++++++++++++++++++++++++++++++----
opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml | 23 ++
opends/src/server/org/opends/server/api/AccessLogPublisher.java | 6
opends/resource/config/config.ldif | 2
6 files changed, 444 insertions(+), 48 deletions(-)
diff --git a/opends/resource/config/config.ldif b/opends/resource/config/config.ldif
index 3fd0524..1efaf92 100644
--- a/opends/resource/config/config.ldif
+++ b/opends/resource/config/config.ldif
@@ -520,6 +520,7 @@
ds-cfg-log-file: logs/access
ds-cfg-log-file-mode: 640
ds-cfg-suppress-internal-operations: true
+ds-cfg-suppress-synchronization-operations: false
ds-cfg-asynchronous-writes: true
ds-cfg-rotation-policy-dn: cn=24 Hours Time Limit Rotation Policy,cn=Log Rotation Policies,cn=config
ds-cfg-rotation-policy-dn: cn=Size Limit Rotation Policy,cn=Log Rotation Policies,cn=config
@@ -536,6 +537,7 @@
ds-cfg-log-file: logs/audit
ds-cfg-log-file-mode: 640
ds-cfg-suppress-internal-operations: true
+ds-cfg-suppress-synchronization-operations: false
ds-cfg-asynchronous-writes: true
ds-cfg-rotation-policy-dn: cn=24 Hours Time Limit Rotation Policy,cn=Log Rotation Policies,cn=config
ds-cfg-rotation-policy-dn: cn=Size Limit Rotation Policy,cn=Log Rotation Policies,cn=config
diff --git a/opends/resource/schema/02-config.ldif b/opends/resource/schema/02-config.ldif
index d677b58..c85b6d2 100644
--- a/opends/resource/schema/02-config.ldif
+++ b/opends/resource/schema/02-config.ldif
@@ -415,6 +415,10 @@
NAME 'ds-cfg-suppress-internal-operations'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.436
+ NAME 'ds-cfg-suppress-synchronization-operations'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
+ X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.124 NAME 'ds-cfg-syntax-class'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
@@ -1597,7 +1601,8 @@
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.23 NAME 'ds-cfg-access-logger'
SUP ds-cfg-logger
- STRUCTURAL MAY ( ds-cfg-suppress-internal-operations )
+ STRUCTURAL MAY ( ds-cfg-suppress-internal-operations $
+ ds-cfg-suppress-synchronization-operations )
X-ORIGIN 'OpenDS Directory Server' )
objectClasses: ( 1.3.6.1.4.1.26027.1.2.24 NAME 'ds-cfg-error-logger'
SUP ds-cfg-logger
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
index da7ab40..52efe9c 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/AccessLogPublisherConfiguration.xml
@@ -41,6 +41,8 @@
<adm:property name="suppress-internal-operations">
<adm:synopsis>
Omit access messages generated by internal operations.
+ Except for Synchronization operations that are controlled
+ by the ds-cfg-suppress-synchronization-operations property.
</adm:synopsis>
<adm:default-behavior>
<adm:defined>
@@ -59,4 +61,25 @@
</ldap:attribute>
</adm:profile>
</adm:property>
+ <adm:property name="suppress-synchronization-operations">
+ <adm:synopsis>
+ Omit access messages generated by synchronization operations.
+ </adm:synopsis>
+ <adm:default-behavior>
+ <adm:defined>
+ <adm:value>
+ false
+ </adm:value>
+ </adm:defined>
+ </adm:default-behavior>
+ <adm:syntax>
+ <adm:boolean />
+ </adm:syntax>
+ <adm:profile name="ldap">
+ <ldap:attribute>
+ <ldap:oid>1.3.6.1.4.1.26027.1.1.436</ldap:oid>
+ <ldap:name>ds-cfg-suppress-synchronization-operations</ldap:name>
+ </ldap:attribute>
+ </adm:profile>
+ </adm:property>
</adm:managed-object>
diff --git a/opends/src/server/org/opends/server/api/AccessLogPublisher.java b/opends/src/server/org/opends/server/api/AccessLogPublisher.java
index 91ad05d..126ba97 100644
--- a/opends/src/server/org/opends/server/api/AccessLogPublisher.java
+++ b/opends/src/server/org/opends/server/api/AccessLogPublisher.java
@@ -52,6 +52,12 @@
*/
protected boolean suppressInternalOperations = true;
+ /**
+ * Indicates if synchronization operations should be omited in the
+ * messages logged by this publisher.
+ */
+ protected boolean suppressSynchronizationOperations = false;
+
/**
diff --git a/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java b/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
index b9f1048..d771aea 100644
--- a/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -183,6 +183,8 @@
}
suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations =
+ config.isSuppressSynchronizationOperations();
currentConfig = config;
@@ -277,6 +279,8 @@
ArrayList<String> messages = new ArrayList<String>();
suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations =
+ config.isSuppressSynchronizationOperations();
File logFile = getFileForPath(config.getLogFile());
FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
@@ -418,6 +422,7 @@
public void logConnect(ClientConnection clientConnection)
{
long connectionID = clientConnection.getConnectionID();
+
if (connectionID < 0 && suppressInternalOperations)
{
return;
@@ -491,9 +496,23 @@
public void logAbandonRequest(AbandonOperation abandonOperation)
{
long connectionID = abandonOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (abandonOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
@@ -508,6 +527,8 @@
buffer.append(abandonOperation.getMessageID());
buffer.append(" idToAbandon=");
buffer.append(abandonOperation.getIDToAbandon());
+ if (abandonOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
writer.writeRecord(buffer.toString());
}
@@ -522,9 +543,23 @@
public void logAbandonResult(AbandonOperation abandonOperation)
{
long connectionID = abandonOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (abandonOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -572,9 +607,23 @@
public void logAddRequest(AddOperation addOperation)
{
long connectionID = addOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (addOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -589,6 +638,9 @@
buffer.append(" dn=\"");
addOperation.getRawEntryDN().toString(buffer);
buffer.append("\"");
+ if (addOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -604,9 +656,23 @@
public void logAddResponse(AddOperation addOperation)
{
long connectionID = addOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (addOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -660,9 +726,23 @@
public void logBindRequest(BindOperation bindOperation)
{
long connectionID = bindOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (bindOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -693,6 +773,9 @@
buffer.append(" dn=\"");
bindOperation.getRawBindDN().toString(buffer);
buffer.append("\"");
+ if (bindOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -708,9 +791,23 @@
public void logBindResponse(BindOperation bindOperation)
{
long connectionID = bindOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (bindOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -794,9 +891,23 @@
public void logCompareRequest(CompareOperation compareOperation)
{
long connectionID = compareOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (compareOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -812,6 +923,9 @@
compareOperation.getRawEntryDN().toString(buffer);
buffer.append("\" attr=");
buffer.append(compareOperation.getAttributeType());
+ if (compareOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -827,9 +941,23 @@
public void logCompareResponse(CompareOperation compareOperation)
{
long connectionID = compareOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (compareOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -882,9 +1010,23 @@
public void logDeleteRequest(DeleteOperation deleteOperation)
{
long connectionID = deleteOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (deleteOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -899,6 +1041,9 @@
buffer.append(" dn=\"");
deleteOperation.getRawEntryDN().toString(buffer);
buffer.append("\"");
+ if (deleteOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
@@ -915,9 +1060,23 @@
public void logDeleteResponse(DeleteOperation deleteOperation)
{
long connectionID = deleteOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (deleteOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -971,9 +1130,23 @@
public void logExtendedRequest(ExtendedOperation extendedOperation)
{
long connectionID = extendedOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (extendedOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -988,6 +1161,9 @@
buffer.append(" oid=\"");
buffer.append(extendedOperation.getRequestOID());
buffer.append("\"");
+ if (extendedOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -1004,9 +1180,23 @@
public void logExtendedResponse(ExtendedOperation extendedOperation)
{
long connectionID = extendedOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (extendedOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1062,9 +1252,23 @@
public void logModifyRequest(ModifyOperation modifyOperation)
{
long connectionID = modifyOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (modifyOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1079,6 +1283,9 @@
buffer.append(" dn=\"");
modifyOperation.getRawEntryDN().toString(buffer);
buffer.append("\"");
+ if (modifyOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -1095,9 +1302,23 @@
public void logModifyResponse(ModifyOperation modifyOperation)
{
long connectionID = modifyOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // this is an internal operation
+ if (modifyOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1151,9 +1372,23 @@
public void logModifyDNRequest(ModifyDNOperation modifyDNOperation)
{
long connectionID = modifyDNOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (modifyDNOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1178,6 +1413,9 @@
buffer.append(" newSuperior=\"");
newSuperior.toString(buffer);
}
+ if (modifyDNOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -1195,9 +1433,23 @@
public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
{
long connectionID = modifyDNOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (modifyDNOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1250,9 +1502,23 @@
public void logSearchRequest(SearchOperation searchOperation)
{
long connectionID = searchOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (searchOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1290,6 +1556,9 @@
buffer.append("\"");
}
+ if (searchOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
@@ -1338,9 +1607,23 @@
public void logSearchResultDone(SearchOperation searchOperation)
{
long connectionID = searchOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (searchOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1399,9 +1682,23 @@
public void logUnbind(UnbindOperation unbindOperation)
{
long connectionID = unbindOperation.getConnectionID();
- if (connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (unbindOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
StringBuilder buffer = new StringBuilder(50);
buffer.append("[");
@@ -1413,6 +1710,9 @@
buffer.append(unbindOperation.getOperationID());
buffer.append(" msgID=");
buffer.append(unbindOperation.getMessageID());
+ if (unbindOperation.isSynchronizationOperation())
+ buffer.append(" type=synchronization");
+
writer.writeRecord(buffer.toString());
}
diff --git a/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java b/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
index 9cb840f..9ee023e 100644
--- a/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -167,6 +167,8 @@
}
suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations =
+ config.isSuppressSynchronizationOperations();
currentConfig = config;
@@ -248,6 +250,8 @@
ArrayList<String> messages = new ArrayList<String>();
suppressInternalOperations = config.isSuppressInternalOperations();
+ suppressSynchronizationOperations =
+ config.isSuppressSynchronizationOperations();
File logFile = getFileForPath(config.getLogFile());
FileNamingPolicy fnPolicy = new TimeStampNaming(logFile);
@@ -274,7 +278,7 @@
if(currentWriter instanceof MultifileTextWriter)
{
- MultifileTextWriter mfWriter = (MultifileTextWriter)writer;
+ MultifileTextWriter mfWriter = (MultifileTextWriter)currentWriter;
mfWriter.setNamingPolicy(fnPolicy);
mfWriter.setFilePermissions(perm);
@@ -435,9 +439,23 @@
public void logAddResponse(AddOperation addOperation)
{
long connectionID = addOperation.getConnectionID();
- if(connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (addOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
ResultCode code = addOperation.getResultCode();
@@ -554,9 +572,23 @@
public void logDeleteResponse(DeleteOperation deleteOperation)
{
long connectionID = deleteOperation.getConnectionID();
- if(connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (deleteOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
ResultCode code = deleteOperation.getResultCode();
@@ -618,9 +650,23 @@
public void logModifyResponse(ModifyOperation modifyOperation)
{
long connectionID = modifyOperation.getConnectionID();
- if(connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (modifyOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
ResultCode code = modifyOperation.getResultCode();
@@ -705,9 +751,23 @@
public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
{
long connectionID = modifyDNOperation.getConnectionID();
- if(connectionID < 0 && suppressInternalOperations)
+ if (connectionID < 0)
{
- return;
+ // This is an internal operation.
+ if (modifyDNOperation.isSynchronizationOperation())
+ {
+ if (suppressSynchronizationOperations)
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (suppressInternalOperations)
+ {
+ return;
+ }
+ }
}
ResultCode code = modifyDNOperation.getResultCode();
--
Gitblit v1.10.0