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

Fix missing IDO updates for groups 

fixes #12527
This commit is contained in:
Gunnar Beutner 2016-08-24 11:35:12 +02:00 committed by Michael Friedrich
parent 8c1fc813d1
commit b238df3fa3
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/db_ido/hostdbobject.cpp
View File

@ -397,6 +397,11 @@ String HostDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
Host::Ptr host = static_pointer_cast<Host>(GetObject()); Host::Ptr host = static_pointer_cast<Host>(GetObject());
Array::Ptr groups = host->GetGroups();
if (groups)
hashData += DbObject::HashValue(groups);
Array::Ptr parents = new Array(); Array::Ptr parents = new Array();
/* parents */ /* parents */

5
lib/db_ido/servicedbobject.cpp
View File

@ -357,6 +357,11 @@ String ServiceDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields)
Service::Ptr service = static_pointer_cast<Service>(GetObject()); Service::Ptr service = static_pointer_cast<Service>(GetObject());
Array::Ptr groups = service->GetGroups();
if (groups)
hashData += DbObject::HashValue(groups);
Array::Ptr dependencies = new Array(); Array::Ptr dependencies = new Array();
/* dependencies */ /* dependencies */

14
lib/db_ido/userdbobject.cpp
View File

@ -163,3 +163,17 @@ void UserDbObject::OnConfigUpdateHeavy(void)
DbObject::OnMultipleQueries(queries); DbObject::OnMultipleQueries(queries);
} }
String UserDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) const
{
String hashData = DbObject::CalculateConfigHash(configFields);
User::Ptr user = static_pointer_cast<User>(GetObject());
Array::Ptr groups = user->GetGroups();
if (groups)
hashData += DbObject::HashValue(groups);
return hashData;
}

2
lib/db_ido/userdbobject.hpp
View File

@ -43,6 +43,8 @@ protected:
virtual Dictionary::Ptr GetStatusFields(void) const override; virtual Dictionary::Ptr GetStatusFields(void) const override;
virtual void OnConfigUpdateHeavy(void) override; virtual void OnConfigUpdateHeavy(void) override;
virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const;
}; };
} }