From 058d8b904cb8a1b27b2d5f0202059b6b8fcb98e9 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 24 Nov 2015 18:12:56 +0000
Subject: [PATCH] OPENDJ-2463 - Provide a method in UpgradeLog class to retrieve the path, and use it instead of constructing it.
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 7 ++-----
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index 1a50c3e..1755f8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -626,9 +626,7 @@
context.notify(
INFO_UPGRADE_SUMMARY.get(context.getFromVersion(), context.getToVersion()),
NOTICE_CALLBACK);
- context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeUtils
- .getInstallationPath()
- + File.separator + UpgradeLog.UPGRADELOGNAME), NOTICE_CALLBACK);
+ context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeLog.getLogFilePath()), NOTICE_CALLBACK);
// Checks License.
checkLicence(context);
@@ -716,8 +714,7 @@
}
finally
{
- context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeUtils.getInstallationPath()
- + File.separator + UpgradeLog.UPGRADELOGNAME), NOTICE_CALLBACK);
+ context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeLog.getLogFilePath()), NOTICE_CALLBACK);
logger.info(INFO_UPGRADE_PROCESS_END);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
index 0b08b2f..e2af014 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
@@ -69,7 +69,8 @@
if (logFile == null)
{
- logFile = new File(UpgradeUtils.getInstancePath() + File.separator + LOGDIR + File.separator + UPGRADELOGNAME);
+ logFile = new File(UpgradeUtils.getInstancePath() + File.separator + Installation.LOGS_PATH_RELATIVE
+ + File.separator + UPGRADELOGNAME);
}
try
{
@@ -86,7 +87,7 @@
public String format(LogRecord record)
{
// Format the log ~like the errors logger.
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
final SimpleDateFormat dateFormat =
new SimpleDateFormat("[dd/MMM/yyyy:HH:mm:ss Z]");
sb.append(dateFormat.format(record.getMillis())).append(SPACE);
@@ -131,4 +132,16 @@
.getMessage()));
}
}
+
+ static String getLogFilePath()
+ {
+ try
+ {
+ return logFile.getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ return logFile.getPath();
+ }
+ }
}
--
Gitblit v1.10.0