mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Fabio Pistolesi
17.34.2016 4cba8fe7c5bfd75fc8334a4e887fba8c71526b4e
Fix build issues from OPENDJ-3324, enable json logger by default.
2 files modified
17 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java 10 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java 7 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
@@ -447,7 +447,12 @@
    {
      builder.response(status, String.valueOf(resultCode), executionTime.getFirst(), executionTime.getSecond());
    }
    builder.ldapMaskedResultAndMessage(operation);
    if (shouldLogControlOids())
    {
      builder.ldapResponseControls(operation);
    }
    builder.ldapMaskedResultAndMessage(operation)
        .ldapAdditionalItems(operation);
    return builder;
  }
@@ -460,14 +465,13 @@
      .client(clientConn.getClientAddress(), clientConn.getClientPort())
      .server(clientConn.getServerAddress(), clientConn.getServerPort())
      .request(clientConn.getProtocol(), opType)
      .ldapAdditionalItems(operation)
      .ldapSync(operation)
      .ldapIds(operation)
      .transactionId(getTransactionId(operation));
    if (shouldLogControlOids())
    {
      builder.ldapControls(operation);
      builder.ldapRequestControls(operation);
    }
    return builder;
  }
opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java
@@ -81,13 +81,18 @@
    return self();
  }
  public T ldapControls(Operation operation)
  public T ldapRequestControls(Operation operation)
  {
    List<Control> requestControls = operation.getRequestControls();
    if (!requestControls.isEmpty())
    {
      getOpRequest().put("controls", getControlsAsString(requestControls));
    }
    return self();
  }
  public T ldapResponseControls(Operation operation)
  {
    List<Control> responseControls = operation.getResponseControls();
    if (!responseControls.isEmpty())
    {