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

Introduce IcingaDB::AddKvsToMap()

Browse Source
This commit is contained in:
Alexander A. Klimov 2022-04-19 13:19:54 +02:00 committed by Julian Brost
parent ce994d8135
commit f9155a2d5f
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/icingadb/icingadb-objects.cpp
View File

@ -230,18 +230,7 @@ void IcingaDB::UpdateAllConfigObjects()
"HSCAN", configCheckSum, cursor, "COUNT", "1000" "HSCAN", configCheckSum, cursor, "COUNT", "1000"
}, Prio::Config); }, Prio::Config);
Array::Ptr kvs = res->Get(1); AddKvsToMap(res->Get(1), redisCheckSums);
Value* key = nullptr;
ObjectLock oLock (kvs);
for (auto& kv : kvs) {
if (key) {
redisCheckSums.emplace(std::move(*key), std::move(kv));
key = nullptr;
} else {
key = &kv;
}
}
cursor = res->Get(0); cursor = res->Get(0);
} while (cursor != "0"); } while (cursor != "0");

16
lib/icingadb/icingadb.hpp
View File

@ -45,6 +45,22 @@ public:
String GetEnvironmentId() const override; String GetEnvironmentId() const override;
template<class T>
static void AddKvsToMap(const Array::Ptr& kvs, T& map)
{
Value* key = nullptr;
ObjectLock oLock (kvs);
for (auto& kv : kvs) {
if (key) {
map.emplace(std::move(*key), std::move(kv));
key = nullptr;
} else {
key = &kv;
}
}
}
protected: protected:
void ValidateTlsProtocolmin(const Lazy<String>& lvalue, const ValidationUtils& utils) override; void ValidateTlsProtocolmin(const Lazy<String>& lvalue, const ValidationUtils& utils) override;
void ValidateConnectTimeout(const Lazy<double>& lvalue, const ValidationUtils& utils) override; void ValidateConnectTimeout(const Lazy<double>& lvalue, const ValidationUtils& utils) override;