Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
auto-tx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vamp
auto-tx
Commits
7383cadc
Commit
7383cadc
authored
7 years ago
by
Niko Ehrenfeuchter
Browse files
Options
Downloads
Patches
Plain Diff
Minor layout / message changes.
parent
75318209
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Updater/Update-Service.ps1
+9
-8
9 additions, 8 deletions
Updater/Update-Service.ps1
with
9 additions
and
8 deletions
Updater/Update-Service.ps1
+
9
−
8
View file @
7383cadc
...
...
@@ -582,7 +582,7 @@ if ($ConfigShouldBeUpdated) {
$UpdItems
+=
"configuration files"
}
# define which configuration checker executable
should be
use
d
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
`n
pass the validator.
`n`n
The following summary"
"was generated by the configuration checker:
`n`n
$(
$ConfigSummary
)
"
)
"configuration didn't
`n
pass the validator.
`n`n
The 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 config
uration
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`n
Config
uration
validation summary:
`n
$(
$ConfigSummary
)
"
$UpdDetails
+=
"
`n`n
Config validation summary:
`n
$(
$ConfigSummary
)
"
}
Send-MailReport
-Subject
"
$UpdSummary
"
-Body
"
$UpdDetails
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment