tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename :overwrite: keys to :override:

This commit is contained in:
Noah Hilverling 2019-07-17 15:08:53 +02:00 committed by Michael Friedrich
parent 0bfdaccc7a
commit fc718d99a7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/redis/rediswriter-objects.cpp
View File

@ -268,10 +268,10 @@ std::vector<String> RedisWriter::GetTypeObjectKeys(const String& type)
keys.emplace_back(m_PrefixConfigObject + type + ":groupmember"); keys.emplace_back(m_PrefixConfigObject + type + ":groupmember");
keys.emplace_back(m_PrefixConfigCheckSum + type + ":groupmember"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":groupmember");
} else if (type == "timeperiod") { } else if (type == "timeperiod") {
keys.emplace_back(m_PrefixConfigObject + type + ":overwrite:include"); keys.emplace_back(m_PrefixConfigObject + type + ":override:include");
keys.emplace_back(m_PrefixConfigCheckSum + type + ":overwrite:include"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":override:include");
keys.emplace_back(m_PrefixConfigObject + type + ":overwrite:exclude"); keys.emplace_back(m_PrefixConfigObject + type + ":override:exclude");
keys.emplace_back(m_PrefixConfigCheckSum + type + ":overwrite:exclude"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":override:exclude");
keys.emplace_back(m_PrefixConfigObject + type + ":range"); keys.emplace_back(m_PrefixConfigObject + type + ":range");
keys.emplace_back(m_PrefixConfigCheckSum + type + ":range"); keys.emplace_back(m_PrefixConfigCheckSum + type + ":range");
} else if (type == "zone") { } else if (type == "zone") {
@ -433,8 +433,8 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
includeChecksums->Reserve(includes->GetLength()); includeChecksums->Reserve(includes->GetLength());
auto& includs (statements[m_PrefixConfigObject + typeName + ":overwrite:include"]); auto& includs (statements[m_PrefixConfigObject + typeName + ":override:include"]);
auto& includeChksms (statements[m_PrefixConfigCheckSum + typeName + ":overwrite:include"]); auto& includeChksms (statements[m_PrefixConfigCheckSum + typeName + ":override:include"]);
for (auto include : includes) { for (auto include : includes) {
String includeId = GetObjectIdentifier((*getInclude)(include.Get<String>())); String includeId = GetObjectIdentifier((*getInclude)(include.Get<String>()));
includeChecksums->Add(includeId); includeChecksums->Add(includeId);
@ -460,8 +460,8 @@ void RedisWriter::InsertObjectDependencies(const ConfigObject::Ptr& object, cons
excludeChecksums->Reserve(excludes->GetLength()); excludeChecksums->Reserve(excludes->GetLength());
auto& excluds (statements[m_PrefixConfigObject + typeName + ":overwrite:exclude"]); auto& excluds (statements[m_PrefixConfigObject + typeName + ":override:exclude"]);
auto& excludeChksms (statements[m_PrefixConfigCheckSum + typeName + ":overwrite:exclude"]); auto& excludeChksms (statements[m_PrefixConfigCheckSum + typeName + ":override:exclude"]);
for (auto exclude : excludes) { for (auto exclude : excludes) {
String excludeId = GetObjectIdentifier((*getExclude)(exclude.Get<String>())); String excludeId = GetObjectIdentifier((*getExclude)(exclude.Get<String>()));