From 7383cadce3d74b5d913cfd39bf21c14b1f276855 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Tue, 20 Feb 2018 17:15:07 +0100
Subject: [PATCH] Minor layout / message changes.
---
Updater/Update-Service.ps1 | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Updater/Update-Service.ps1 b/Updater/Update-Service.ps1
index ea63423..22688e0 100644
--- a/Updater/Update-Service.ps1
+++ b/Updater/Update-Service.ps1
@@ -582,7 +582,7 @@ if ($ConfigShouldBeUpdated) {
$UpdItems += "configuration files"
}
-# define which configuration checker executable should be used for testing:
+# define which configuration checker executable to use for testing:
$ConftestExe = "$($InstallationPath)\AutoTxConfigTest.exe"
if ($ServiceShouldBeUpdated) {
$UpdPackage = Find-InstallationPackage
@@ -594,13 +594,14 @@ if ($ServiceShouldBeUpdated) {
$ConfigValid, $ConfigSummary = Config-IsValid $ConftestExe $ConfigToTest
-# if we don't have a valid configuration we complain and terminate the update:
+# if we don't have a valid configuration we complain and terminate:
if (-Not ($ConfigValid)) {
Log-Error "Configuration not valid for service, $($Me) terminating!"
Send-MailReport -Subject "Update failed, configuration invalid!" `
-Body $("An update action was found to be necessary, however the"
- "configuration didn't`npass the validator.`n`nThe following summary"
- "was generated by the configuration checker:`n`n$($ConfigSummary)")
+ "configuration didn't`npass the validator.`n`nThe following"
+ "summary was generated by the configuration checker:"
+ "`n`n$($ConfigSummary)")
Exit
}
@@ -608,8 +609,8 @@ if (-Not ($ConfigValid)) {
# reaching this point means
# (1) something needs to be updated (config, service or both)
# AND
-# (2) the configuration validates with the corresponding service version
-Write-Verbose "Required update action items:`n> - $($UpdItems -join "`n> - ")`n"
+# (2) the config validates with the corresponding service version
+Write-Verbose "Required update items:`n> - $($UpdItems -join "`n> - ")`n"
if ($ConfigShouldBeUpdated) {
$ConfigUpdated = Update-Configuration
@@ -639,13 +640,13 @@ if ($ServiceRunningBefore) {
Log-Debug "$($UpdSummary) Trying to start the service again..."
Start-MyService
} else {
- Log-Debug "$($UpdSummary) Leaving the service stopped, as it was before."
+ Log-Debug "$($UpdSummary) Leaving the service stopped, as before."
}
$UpdDetails = $("An $($Me) run completed successfully. Updated items:"
"`n> - $($UpdItems -join "`n> - ")")
if ($ConfigUpdated) {
- $UpdDetails += "`n`nConfiguration validation summary:`n$($ConfigSummary)"
+ $UpdDetails += "`n`nConfig validation summary:`n$($ConfigSummary)"
}
Send-MailReport -Subject "$UpdSummary" -Body "$UpdDetails"
--
GitLab