From 08d9358f33e064cab2d54f8341c7d26f5a3abda8 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 May 2016 13:02:12 +0000
Subject: [PATCH] Make some replication error messages more readable
---
opendj-server-legacy/src/messages/org/opends/messages/replication.properties | 8 ++++----
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 8581707..3ce9630 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -63,6 +63,7 @@
import org.forgerock.opendj.adapter.server3x.Converters;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.AVA;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DN;
@@ -72,7 +73,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
@@ -736,7 +736,7 @@
&& search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
String errorMsg = search.getResultCode().getName() + " " + search.getErrorMessage();
- logger.error(ERR_SEARCHING_GENERATION_ID, errorMsg, getBaseDN());
+ logger.error(ERR_SEARCHING_GENERATION_ID, getBaseDN(), errorMsg);
return false;
}
@@ -3238,7 +3238,7 @@
if (result != ResultCode.SUCCESS)
{
- logger.error(ERR_UPDATING_GENERATION_ID, result.getName(), getBaseDN());
+ logger.error(ERR_UPDATING_GENERATION_ID, getBaseDN(), result.getName());
}
}
else
@@ -3282,7 +3282,7 @@
if (search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
{
String errorMsg = search.getResultCode().getName() + " " + search.getErrorMessage();
- logger.error(ERR_SEARCHING_GENERATION_ID, errorMsg, getBaseDN());
+ logger.error(ERR_SEARCHING_GENERATION_ID, getBaseDN(), errorMsg);
}
}
else
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
index 7056411..d8d02a4 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/replication.properties
@@ -124,14 +124,14 @@
be closed : %s
ERR_COULD_NOT_STOP_LISTEN_THREAD_71=The thread listening on the \
replication server port could not be stopped : %s
-ERR_SEARCHING_GENERATION_ID_73=An unexpected error %s occurred when \
-searching for generation id for domain : %s
+ERR_SEARCHING_GENERATION_ID_73=An unexpected error occurred when \
+searching for generation id for domain "%s": %s
ERR_SEARCHING_DOMAIN_BACKEND_74=An unexpected error occurred when \
looking for the replicated backend : %s. It may be not configured or disabled
ERR_LOADING_GENERATION_ID_75=An unexpected error occurred when \
searching in %s for the generation ID : %s
-ERR_UPDATING_GENERATION_ID_76=An unexpected error %s occurred \
-when updating generation ID for the domain : %s
+ERR_UPDATING_GENERATION_ID_76=An unexpected error occurred \
+when updating generation ID for domain "%s": %s
ERR_ERROR_MSG_RECEIVED_79=The following error has been received : %s
ERR_INIT_IMPORT_NOT_SUPPORTED_82= Initialization cannot be done because \
import is not supported by the backend %s
--
Gitblit v1.10.0