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

ido: Don't send config/status updates if the object doesn't support them.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-08-01 09:32:14 +02:00
parent 260b5f174f
commit ce8864e0e2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ido/dbobject.cpp
View File

@ -71,6 +71,11 @@ DbType::Ptr DbObject::GetType(void) const
void DbObject::SendConfigUpdate(void) void DbObject::SendConfigUpdate(void)
{ {
Dictionary::Ptr fields = GetConfigFields();
if (!fields)
return;
DbQuery query1; DbQuery query1;
query1.Table = "icinga_" + GetType()->GetTable() + "s"; query1.Table = "icinga_" + GetType()->GetTable() + "s";
query1.Type = DbQueryDelete; query1.Type = DbQueryDelete;
@ -81,12 +86,7 @@ void DbObject::SendConfigUpdate(void)
DbQuery query2; DbQuery query2;
query2.Table = "icinga_" + GetType()->GetTable() + "s"; query2.Table = "icinga_" + GetType()->GetTable() + "s";
query2.Type = DbQueryInsert; query2.Type = DbQueryInsert;
query2.Fields = fields;
query2.Fields = GetConfigFields();
if (!query2.Fields)
return;
query2.Fields->Set(GetType()->GetTable() + "_object_id", GetObject()); query2.Fields->Set(GetType()->GetTable() + "_object_id", GetObject());
query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */ query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.Fields->Set("config_type", 1); query2.Fields->Set("config_type", 1);
@ -99,6 +99,11 @@ void DbObject::SendConfigUpdate(void)
void DbObject::SendStatusUpdate(void) void DbObject::SendStatusUpdate(void)
{ {
Dictionary::Ptr fields = GetStatusFields();
if (!fields)
return;
DbQuery query1; DbQuery query1;
query1.Table = "icinga_" + GetType()->GetTable() + "status"; query1.Table = "icinga_" + GetType()->GetTable() + "status";
query1.Type = DbQueryDelete; query1.Type = DbQueryDelete;
@ -109,12 +114,7 @@ void DbObject::SendStatusUpdate(void)
DbQuery query2; DbQuery query2;
query2.Table = "icinga_" + GetType()->GetTable() + "status"; query2.Table = "icinga_" + GetType()->GetTable() + "status";
query2.Type = DbQueryInsert; query2.Type = DbQueryInsert;
query2.Fields = fields;
query2.Fields = GetStatusFields();
if (!query2.Fields)
return;
query2.Fields->Set(GetType()->GetTable() + "_object_id", GetObject()); query2.Fields->Set(GetType()->GetTable() + "_object_id", GetObject());
query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */ query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.Fields->Set("status_update_time", DbValue::FromTimestamp(Utility::GetTime())); query2.Fields->Set("status_update_time", DbValue::FromTimestamp(Utility::GetTime()));