tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9740 from Icinga/freeze-globals

Browse Source 
Freeze globals namespace during config load
This commit is contained in:
Julian Brost 2023-03-31 10:51:26 +02:00 committed by GitHub
commit 82f9e4312d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli/daemonutility.cpp
View File

@ -247,6 +247,11 @@ bool DaemonUtility::LoadConfigFiles(const std::vector<std::string>& configs,
return false; return false;
} }
// After evaluating the top-level statements of the config files (happening in ValidateConfigFiles() above),
// prevent further modification of the global scope. This allows for a faster execution of the following steps
// as Freeze() disables locking as it's not necessary on a read-only data structure anymore.
ScriptGlobal::GetGlobals()->Freeze();
WorkQueue upq(25000, Configuration::Concurrency); WorkQueue upq(25000, Configuration::Concurrency);
upq.SetName("DaemonUtility::LoadConfigFiles"); upq.SetName("DaemonUtility::LoadConfigFiles");
bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems); bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems);