WIP

Author: LordHepipud

lib/core/framework/Clear-IcingaInternalServiceInformation.psm1

@@ -0,0 +1,8 @@
+function Clear-IcingaInternalServiceInformation()
+{
+    $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+    $Global:Icinga.Protected.IcingaServiceUser  = '';
+    $Global:Icinga.Protected.IfWServiceUser     = '';
+    $Global:Icinga.Protected.IcingaServiceState = '';
+    $Global:Icinga.Protected.IfWServiceState    = '';
+}

lib/core/installer/Install-Icinga.psm1

@@ -70,7 +70,7 @@ function Install-Icinga()
             $JsonInstallCmd = ConvertFrom-Json -InputObject $InstallCommand -ErrorAction Stop;
         } catch {
             Write-IcingaConsoleError 'Failed to deserialize the provided JSON from file or command: {0}' -Objects $_.Exception.Message;
-            $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+            Clear-IcingaInternalServiceInformation;
             return;
         }
 
@@ -84,7 +84,7 @@ function Install-Icinga()
         $Success = Invoke-IcingaForWindowsManagementConsoleCustomConfig -IcingaConfiguration $IcingaConfiguration;
 
         if ($Success -eq $FALSE) {
-            $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+            Clear-IcingaInternalServiceInformation;
             return;
         }
 
@@ -105,7 +105,7 @@ function Install-Icinga()
         $Success = Invoke-IcingaForWindowsManagementConsoleCustomConfig -IcingaConfiguration $IcingaConfiguration;
 
         if ($Success -eq $FALSE) {
-            $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+            Clear-IcingaInternalServiceInformation;
             return;
         }
 
@@ -116,7 +116,7 @@ function Install-Icinga()
         # Set our "old" swap live again. By doing so, we can still continue our old
         # configuration
         Set-IcingaPowerShellConfig -Path 'Framework.Config.Swap' -Value $OldConfigSwap;
-        $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+        Clear-IcingaInternalServiceInformation;
         return;
     }
 
@@ -191,7 +191,7 @@ function Install-Icinga()
         }
     }
 
-    $Global:Icinga.Protected.ServiceRestartLock = $FALSE;
+    Clear-IcingaInternalServiceInformation;
 
     if ($null -ne (Get-Command -Name 'Set-IcingaForWindowsManagementConsoleClosing' -ErrorAction SilentlyContinue)) {
         Set-IcingaForWindowsManagementConsoleClosing -Completed;