Merge pull request #647 from Icinga:fix/improve_exception_and_error_handling

Feature: Improves error/exception handling

Author: LordHepipud

lib/icinga/exception/Exit-IcingaThrowCritical.psm1

@@ -25,8 +25,13 @@ function Exit-IcingaThrowCritical()
     Set-IcingaInternalPluginExitCode -ExitCode $IcingaEnums.IcingaExitCode.Critical;
     Set-IcingaInternalPluginException -PluginException $OutputMessage;
 
-    if ($Global:Icinga.Protected.RunAsDaemon -eq $FALSE -And $Global:Icinga.Protected.JEAContext -eq $FALSE) {
-        Write-IcingaConsolePlain $OutputMessage;
-        exit $IcingaEnums.IcingaExitCode.Critical;
+    if ($Global:Icinga.Protected.RunAsDaemon -eq $TRUE -Or $Global:Icinga.Protected.JEAContext -eq $TRUE) {
+        throw $OutputMessage;
+
+        # Just in case we don't end - shouldn't happen anyway
+        return;
     }
+
+    Write-IcingaConsolePlain $OutputMessage;
+    exit $IcingaEnums.IcingaExitCode.Critical;
 }

lib/icinga/exception/Exit-IcingaThrowException.psm1

@@ -110,10 +110,13 @@ function Exit-IcingaThrowException()
     Set-IcingaInternalPluginExitCode -ExitCode $IcingaEnums.IcingaExitCode.Unknown;
     Set-IcingaInternalPluginException -PluginException $OutputMessage;
 
-    if ($Global:Icinga.Protected.RunAsDaemon -eq $FALSE -And $Global:Icinga.Protected.JEAContext -eq $FALSE) {
-        Write-IcingaConsolePlain $OutputMessage;
-        exit $IcingaEnums.IcingaExitCode.Unknown;
-    } else {
+    if ($Global:Icinga.Protected.RunAsDaemon -eq $TRUE -Or $Global:Icinga.Protected.JEAContext -eq $TRUE) {
         throw $OutputMessage;
+
+        # Just in case we don't end - shouldn't happen anyway
+        return;
     }
+
+    Write-IcingaConsolePlain $OutputMessage;
+    exit $IcingaEnums.IcingaExitCode.Unknown;
 }