From 3646f6503fa1e2d01b850c6e80f3b4f723ccbb05 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 03 Jun 2013 09:34:57 +0000
Subject: [PATCH] Minor fix on Upgrade's log file.
---
opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java | 7 +++++--
opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index a2fec11..5082c58 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -358,6 +358,8 @@
// Main process
try
{
+ // Creates the log file.
+ UpgradeLog.initLogFileHandler();
// Upgrade's context.
UpgradeContext context =
@@ -369,9 +371,6 @@
context.setInteractiveMode(isInteractive());
context.setForceUpgradeMode(isForceUpgrade());
- // Creates the log file.
- UpgradeLog.initLogFileHandler();
-
// Starts upgrade.
Upgrade.upgrade(context);
}
@@ -384,7 +383,8 @@
}
catch (Exception ex)
{
- LOG.log(SEVERE, ex.getMessage());
+ LOG.log(SEVERE, ERR_UPGRADE_MAIN_UPGRADE_PROCESS.get(ex
+ .getMessage()).toString());
println(Style.ERROR, ERR_UPGRADE_MAIN_UPGRADE_PROCESS.get(ex
.getMessage()), 0);
diff --git a/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index b1d5994..9e2ffc1 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -503,6 +503,9 @@
changeType, lines));
entry = Entries.modifyEntryPermissive(entry, mr.getModifications());
changeCount++;
+ LOG.log(Level.INFO,
+ String.format("The following entry has been modified : %s",
+ entry.getName()));
}
catch (Exception ex)
{
@@ -607,7 +610,7 @@
final String definition =
"attributeTypes: " + schema.getAttributeType(att);
definitionsList.add(definition);
- LOG.log(Level.INFO, String.format("Added : %s", definition));
+ LOG.log(Level.INFO, String.format("Added %s", definition));
}
catch (UnknownSchemaElementException e)
{
@@ -626,7 +629,7 @@
final String definition =
"objectClasses: " + schema.getObjectClass(oc);
definitionsList.add(definition);
- LOG.log(Level.INFO, String.format("Added : %s", definition));
+ LOG.log(Level.INFO, String.format("Added %s", definition));
}
catch (UnknownSchemaElementException e)
{
--
Gitblit v1.10.0