mirror of https://github.com/Icinga/icinga2.git
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
This commit is contained in:
parent
71a8f35354
commit
1c7fddb780
|
@ -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.");
|
||||
|
||||
|
|
Loading…
Reference in New Issue