From 1c7fddb780d5ddb7d816b14e0a0fedbdd306fec2 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 12 Oct 2018 16:18:55 +0200 Subject: [PATCH] Initialize Configuration::InitRunDir for Windows and writing the PID file Even if this some Unix specific stuff, we rely on writing this file in our generic application code. Therefore its path needs to be specified. This got broken with 9fbc406 which renamed RunDir to InitRunDir, but didn't re-add it to the Windows #ifdefs. fixes #6677 --- icinga-app/icinga.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index a2bf8001c..040e35e95 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -200,7 +200,6 @@ static int Main() String dataPrefix = Utility::GetIcingaDataPath(); if (!binaryPrefix.IsEmpty() && !dataPrefix.IsEmpty()) { - Configuration::PrefixDir = binaryPrefix; Configuration::ProgramData = dataPrefix; Configuration::ConfigDir = dataPrefix + "\\etc\\icinga2"; @@ -210,9 +209,13 @@ static int Main() Configuration::CacheDir = dataPrefix + "\\var\\cache\\icinga2"; Configuration::SpoolDir = dataPrefix + "\\var\\spool\\icinga2"; + Configuration::PrefixDir = binaryPrefix; + /* Internal constants. */ Configuration::PkgDataDir = binaryPrefix + "\\share\\icinga2"; Configuration::IncludeConfDir = binaryPrefix + "\\share\\icinga2\\include"; + + Configuration::InitRunDir = dataPrefix + "\\var\\run\\icinga2"; } else { Log(LogWarning, "icinga-app", "Registry key could not be read. Falling back to built-in paths."); -- 2.40.0