From 4cba8fe7c5bfd75fc8334a4e887fba8c71526b4e Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 17 Oct 2016 11:38:15 +0000
Subject: [PATCH] Fix build issues from OPENDJ-3324, enable json logger by default.
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java | 7 ++++++-
opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java | 10 +++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
index 78d4989..9134b99 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/CommonAuditAccessLogPublisher.java
+++ b/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;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java
index 7b60554..705a293 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/OpenDJAccessEventBuilder.java
+++ b/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())
{
--
Gitblit v1.10.0