OPENDJ-2511 Common Audit doesn't log messages with DISCONNECT record type

Nicolas Capponi

09.57.2015 de7a38699a83cd9ee7c35143d8986fa05ebdd3d9

OPENDJ-2511 Common Audit doesn't log messages with DISCONNECT record type

 opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java

@@ -284,12 +284,12 @@
        .eventName("DJ-" + clientConnection.getProtocol() + "-" + "DISCONNECT")
        .client(clientConnection.getClientAddress(), clientConnection.getClientPort())
        .server(clientConnection.getServerAddress(), clientConnection.getServerPort())
        .request(clientConnection.getProtocol(),"DISCONNECT")
        .request(clientConnection.getProtocol(), "DISCONNECT")
        .transactionId(CommonAudit.DEFAULT_TRANSACTION_ID)
        .response(ResponseStatus.SUCCESSFUL, String.valueOf(ResultCode.SUCCESS.intValue()), 0, TimeUnit.MILLISECONDS)
        .ldapConnectionId(clientConnection.getConnectionID())
        .ldapReason(disconnectReason.toString())
        .ldapMessage(message.toString());
        .ldapReason(disconnectReason)
        .ldapMessage(message);

    sendEvent(builder.toEvent());
  }

 opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java

@@ -33,6 +33,7 @@
import java.util.Set;

import org.forgerock.audit.events.AccessAuditEventBuilder;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.json.JsonValue;
import org.forgerock.util.Reject;
@@ -40,6 +41,7 @@
import org.opends.server.core.SearchOperation;
import org.opends.server.types.AdditionalLogItem;
import org.opends.server.types.Control;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.Operation;

/**
@@ -142,9 +144,12 @@
    return self();
  }

  public T ldapMessage(String msg)
  public T ldapMessage(LocalizableMessage msg)
  {
    getLdapValue().put("message", msg);
    if (msg != null)
    {
      getLdapValue().put("message", msg.toString());
    }
    return self();
  }

@@ -181,9 +186,9 @@
    return self();
  }

  public T ldapReason(String msg)
  public T ldapReason(DisconnectReason reason)
  {
    getLdapValue().put("reason", msg);
    getLdapValue().put("reason", reason.toString());
    return self();
  }