upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-02-19 02:29:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 63638f8f26 into 333534096e

Browse source
This commit is contained in:
Alexander Aleksandrovič Klimov 2026-02-16 09:55:55 +01:00 committed by GitHub
commit 06ea866a74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/base/scriptutils.cpp
View file

@ -451,8 +451,9 @@ Array::Ptr ScriptUtils::GetTemplates(const Type::Ptr& type)
BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid type: Must not be null"));
ArrayData result;
auto items (ConfigItem::GetItems(type));
for (const ConfigItem::Ptr& item : ConfigItem::GetItems(type)) {
for (auto& item : *items) {
if (item->IsAbstract())
result.push_back(GetTargetForTemplate(item));
}

2
lib/cli/daemonutility.cpp
View file

@ -225,7 +225,7 @@ bool DaemonUtility::ValidateConfigFiles(const std::vector<std::string>& configs,
Type::Ptr appType = Type::GetByName(vAppType);
if (ConfigItem::GetItems(appType).empty()) {
if (ConfigItem::GetItems(appType)->empty()) {
ConfigItemBuilder builder;
builder.SetType(appType);
builder.SetName("app");

20
lib/config/configitem.cpp
View file

@ -33,6 +33,7 @@ using namespace icinga;
std::mutex ConfigItem::m_Mutex;
ConfigItem::TypeMap ConfigItem::m_Items;
std::map<Type::Ptr, std::shared_ptr<std::vector<ConfigItem::Ptr>>> ConfigItem::m_CachedAllItemsByType;
ConfigItem::TypeMap ConfigItem::m_DefaultTemplates;
ConfigItem::ItemList ConfigItem::m_UnnamedItems;
ConfigItem::IgnoredItemList ConfigItem::m_IgnoredItems;
@ -345,6 +346,7 @@ void ConfigItem::Register()
}
m_Items[m_Type][m_Name] = this;
m_CachedAllItemsByType.erase(m_Type);
if (m_DefaultTmpl)
m_DefaultTemplates[m_Type][m_Name] = this;
@ -364,6 +366,7 @@ void ConfigItem::Unregister()
std::unique_lock<std::mutex> lock(m_Mutex);
m_UnnamedItems.erase(std::remove(m_UnnamedItems.begin(), m_UnnamedItems.end(), this), m_UnnamedItems.end());
m_Items[m_Type].erase(m_Name);
m_CachedAllItemsByType.erase(m_Type);
m_DefaultTemplates[m_Type].erase(m_Name);
}
@ -754,21 +757,28 @@ bool ConfigItem::RunWithActivationContext(const Function::Ptr& function)
return true;
}
std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const Type::Ptr& type)
std::shared_ptr<const std::vector<ConfigItem::Ptr>> ConfigItem::GetItems(const Type::Ptr& type)
{
std::vector<ConfigItem::Ptr> items;
std::unique_lock<std::mutex> lock(m_Mutex);
auto cached (m_CachedAllItemsByType.find(type));
if (cached != m_CachedAllItemsByType.end()) {
return cached->second;
}
auto items (std::make_shared<std::vector<ConfigItem::Ptr>>());
m_CachedAllItemsByType.emplace(type, items);
auto it = m_Items.find(type);
if (it == m_Items.end())
return items;
items.reserve(it->second.size());
items->reserve(it->second.size());
for (const ItemMap::value_type& kv : it->second) {
items.push_back(kv.second);
items->push_back(kv.second);
}
return items;

4
lib/config/configitem.hpp
View file

@ -9,6 +9,7 @@
#include "config/activationcontext.hpp"
#include "base/configobject.hpp"
#include "base/workqueue.hpp"
#include <memory>
namespace icinga
{
@ -59,7 +60,7 @@ public:
static bool RunWithActivationContext(const Function::Ptr& function);
static std::vector<ConfigItem::Ptr> GetItems(const Type::Ptr& type);
static std::shared_ptr<const std::vector<ConfigItem::Ptr>> GetItems(const Type::Ptr& type);
static std::vector<ConfigItem::Ptr> GetDefaultTemplates(const Type::Ptr& type);
static void RemoveIgnoredItems(const String& allowedConfigPath);
@ -86,6 +87,7 @@ private:
typedef std::map<String, ConfigItem::Ptr> ItemMap;
typedef std::map<Type::Ptr, ItemMap> TypeMap;
static TypeMap m_Items; /**< All registered configuration items. */
static std::map<Type::Ptr, std::shared_ptr<std::vector<ConfigItem::Ptr>>> m_CachedAllItemsByType;
static TypeMap m_DefaultTemplates;
typedef std::vector<ConfigItem::Ptr> ItemList;

4
lib/icinga/hostgroup.cpp
View file

@ -48,7 +48,9 @@ void HostGroup::EvaluateObjectRules(const Host::Ptr& host)
{
CONTEXT("Evaluating group memberships for host '" << host->GetName() << "'");
for (const ConfigItem::Ptr& group : ConfigItem::GetItems(HostGroup::TypeInstance))
auto items (ConfigItem::GetItems(HostGroup::TypeInstance));
for (auto& group : *items)
{
if (!group->GetFilter())
continue;

4
lib/icinga/servicegroup.cpp
View file

@ -51,7 +51,9 @@ void ServiceGroup::EvaluateObjectRules(const Service::Ptr& service)
{
CONTEXT("Evaluating group membership for service '" << service->GetName() << "'");
for (const ConfigItem::Ptr& group : ConfigItem::GetItems(ServiceGroup::TypeInstance))
auto items (ConfigItem::GetItems(ServiceGroup::TypeInstance));
for (auto& group : *items)
{
if (!group->GetFilter())
continue;

4
lib/icinga/usergroup.cpp
View file

@ -49,7 +49,9 @@ void UserGroup::EvaluateObjectRules(const User::Ptr& user)
{
CONTEXT("Evaluating group membership for user '" << user->GetName() << "'");
for (const ConfigItem::Ptr& group : ConfigItem::GetItems(UserGroup::TypeInstance))
auto items (ConfigItem::GetItems(UserGroup::TypeInstance));
for (auto& group : *items)
{
if (!group->GetFilter())
continue;

3
lib/remote/templatequeryhandler.cpp
View file

@ -41,8 +41,9 @@ public:
const std::function<void (const Value&)>& addTarget) const override
{
Type::Ptr ptype = Type::GetByName(type);
auto items (ConfigItem::GetItems(ptype));
for (const ConfigItem::Ptr& item : ConfigItem::GetItems(ptype)) {
for (auto& item : *items) {
if (item->IsAbstract())
addTarget(GetTargetForTemplate(item));
}