From 3b15a98cb11aa68f681fa7ba0dd793cb56ba02d9 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 15:18:05 +0000
Subject: [PATCH] OPENDJ-2955 Add logs to rest2ldap gateway
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
index e0ff373..1901eb4 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
@@ -15,6 +15,7 @@
*/
package org.forgerock.opendj.rest2ldap;
+import static org.forgerock.i18n.LocalizableMessage.raw;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.*;
import static java.util.Arrays.asList;
import static org.forgerock.opendj.ldap.Filter.alwaysFalse;
@@ -39,6 +40,8 @@
import java.util.List;
import java.util.Set;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.json.JsonPointer;
import org.forgerock.json.JsonValue;
import org.forgerock.json.JsonValueException;
@@ -95,6 +98,7 @@
import org.forgerock.services.context.Context;
import org.forgerock.services.context.SecurityContext;
import org.forgerock.util.AsyncFunction;
+
import org.forgerock.util.Function;
import org.forgerock.util.promise.ExceptionHandler;
import org.forgerock.util.promise.Promise;
@@ -109,6 +113,9 @@
* resource collection to LDAP entries beneath a base DN.
*/
final class LDAPCollectionResourceProvider implements CollectionResourceProvider {
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
/** Dummy exception used for signalling search success. */
private static final ResourceException SUCCESS = new UncategorizedException(0, null, null);
@@ -171,7 +178,9 @@
oldPassword = jsonContent.get("oldPassword").asString();
newPassword = jsonContent.get("newPassword").asString();
} catch (JsonValueException e) {
- final ResourceException ex = newBadRequestException(ERR_PASSWORD_MODIFY_REQUEST_IS_INVALID.get(), e);
+ final LocalizableMessage msg = ERR_PASSWORD_MODIFY_REQUEST_IS_INVALID.get();
+ final ResourceException ex = newBadRequestException(msg, e);
+ logger.error(msg, e);
return Promises.newExceptionPromise(ex);
}
@@ -233,6 +242,7 @@
request.getNewResourceId(),
addRequest);
} catch (final ResourceException e) {
+ logger.error(raw(e.getLocalizedMessage()), e);
return Promises.newExceptionPromise(e);
}
if (config.readOnUpdatePolicy() == CONTROLS) {
@@ -669,7 +679,7 @@
cookie = control.getCookie().toBase64String();
}
} catch (final DecodeException e) {
- // FIXME: need some logging.
+ logger.error(ERR_DECODING_CONTROL.get(e.getLocalizedMessage()), e);
}
}
completeIfNecessary(SUCCESS, promise);
@@ -930,7 +940,7 @@
}
}
} catch (final DecodeException e) {
- // FIXME: log something?
+ logger.error(ERR_DECODING_CONTROL.get(e.getLocalizedMessage()), e);
entry = null;
}
if (entry != null) {
--
Gitblit v1.10.0