Skip to content
Snippets Groups Projects
Commit ef210f24 authored by Niko Ehrenfeuchter's avatar Niko Ehrenfeuchter :keyboard:
Browse files

Make Stop-MyService log a message, depending on the service state.

parent c8614b14
No related branches found
No related tags found
No related merge requests found
...@@ -70,8 +70,13 @@ function Get-LastLogLines([string]$Path, [int]$Count) { ...@@ -70,8 +70,13 @@ function Get-LastLogLines([string]$Path, [int]$Count) {
} }
function Stop-MyService { function Stop-MyService([string]$Message) {
if ((Get-Service $ServiceName).Status -eq "Stopped") {
Log-Info "$($Message) (Service already in state 'Stopped')"
Return
}
try { try {
Log-Info "$($Message) Attempting service $($ServiceName) shutdown..."
Stop-Service "$($ServiceName)" -ErrorAction Stop Stop-Service "$($ServiceName)" -ErrorAction Stop
Write-Verbose "Stopped service $($ServiceName)." Write-Verbose "Stopped service $($ServiceName)."
} }
...@@ -186,8 +191,7 @@ function Update-File { ...@@ -186,8 +191,7 @@ function Update-File {
Return $False Return $False
} }
Log-Info "Found newer file at $($SrcFile), updating..." Stop-MyService "Found newer file at $($SrcFile), updating..."
Stop-MyService
try { try {
Create-Backup -FileName $DstFile Create-Backup -FileName $DstFile
...@@ -228,6 +232,7 @@ function Copy-ServiceFiles { ...@@ -228,6 +232,7 @@ function Copy-ServiceFiles {
Where-Object {$_ -match $Pattern} | Where-Object {$_ -match $Pattern} |
Sort-Object | Sort-Object |
Select-Object -Last 1 Select-Object -Last 1
Stop-MyService "Trying to update service using package [$($PkgDir)]."
Write-Verbose "Update source package: $($PkgDir)" Write-Verbose "Update source package: $($PkgDir)"
Copy-Item -Recurse -Force -ErrorAction Stop ` Copy-Item -Recurse -Force -ErrorAction Stop `
-Path "$($UpdateBinariesPath)\$($PkgDir)\$($ServiceName)\*" ` -Path "$($UpdateBinariesPath)\$($PkgDir)\$($ServiceName)\*" `
...@@ -247,8 +252,6 @@ function Update-ServiceBinaries { ...@@ -247,8 +252,6 @@ function Update-ServiceBinaries {
Write-Verbose "Found marker [$($MarkerFile)], not updating service." Write-Verbose "Found marker [$($MarkerFile)], not updating service."
Return $False Return $False
} }
Log-Info "Marker file ($($MarkerFile)) missing, trying to update service."
Stop-MyService
Copy-ServiceFiles Copy-ServiceFiles
try { try {
New-Item -Type File "$MarkerFile" -ErrorAction Stop | Out-Null New-Item -Type File "$MarkerFile" -ErrorAction Stop | Out-Null
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment