Merge pull request #130 from Icinga:fix/crash_on_background_service_checks

LordHepipud · web-flow · commit 77815898e254 · 2020-10-01T16:51:16.000+02:00
Bugfix: Fix crash on background service execution caused by missing Perf Data cache

Fix crash while running services as background task to collect metrics over time by missing Performance Counter cache initialisation.
diff --git a/doc/31-Changelog.md b/doc/31-Changelog.md
@@ -15,6 +15,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 
 * [#127](https://github.com/Icinga/icinga-powershell-framework/issues/127) Fixes wrong error message on failed MSSQL connection due to database not reachable by using `-IntegratedSecurity`
 * [#128](https://github.com/Icinga/icinga-powershell-framework/issues/128) Fixes unhandled output from loading `System.Reflection.Assembly` which can cause weird side effects for plugin outputs
+* [#130](https://github.com/Icinga/icinga-powershell-framework/issues/130) Fix crash while running services as background task to collect metrics over time by missing Performance Counter cache initialisation
 
 ## 1.2.0 (2020-08-28)
 
diff --git a/icinga-powershell-framework.psm1 b/icinga-powershell-framework.psm1
@@ -43,7 +43,6 @@ function Use-Icinga()
                 'DebugMode'                = $DebugMode;
             }
         );
-        New-IcingaPerformanceCounterCache;
     } else {
         # This will fix the debug mode in case we are only using Libs
         # without any other variable content and daemon handling
@@ -57,6 +56,7 @@ function Use-Icinga()
             $global:IcingaDaemonData.FrameworkRunningAsDaemon = $Daemon;
         }
     }
+    New-IcingaPerformanceCounterCache;
 
     # Enable DebugMode in case it is enabled in our config
     if (Get-IcingaFrameworkDebugMode) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ function Use-Icinga()`
`43`	`43`	`'DebugMode' = $DebugMode;`
`44`	`44`	`}`
`45`	`45`	`);`
`46`		`- New-IcingaPerformanceCounterCache;`
`47`	`46`	`} else {`
`48`	`47`	`# This will fix the debug mode in case we are only using Libs`
`49`	`48`	`# without any other variable content and daemon handling`
`@@ -57,6 +56,7 @@ function Use-Icinga()`
`57`	`56`	`$global:IcingaDaemonData.FrameworkRunningAsDaemon = $Daemon;`
`58`	`57`	`}`
`59`	`58`	`}`
	`59`	`+ New-IcingaPerformanceCounterCache;`
`60`	`60`
`61`	`61`	`# Enable DebugMode in case it is enabled in our config`
`62`	`62`	`if (Get-IcingaFrameworkDebugMode) {`