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

Implement data processing options (DbConnection::categories).

Browse Source 
Refs #4782
This commit is contained in:
Gunnar Beutner 2013-10-29 16:08:52 +01:00
parent f39eff323e
commit 8c5bff3f75
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -407,6 +407,9 @@ void IdoMysqlConnection::ExecuteQuery(const DbQuery& query)
ASSERT(query.Category != DbCatInvalid); ASSERT(query.Category != DbCatInvalid);
if ((query.Category & GetCategories()) == 0)
return;
if (!m_Connected) if (!m_Connected)
return; return;

2
lib/db_ido/dbconnection.cpp
View File

@ -73,7 +73,7 @@ void DbConnection::ProgramStatusHandler(void)
DbQuery query1; DbQuery query1;
query1.Table = "programstatus"; query1.Table = "programstatus";
query1.Type = DbQueryDelete; query1.Type = DbQueryDelete;
query1.Type = DbCatProgramStatus; query1.Category = DbCatProgramStatus;
query1.WhereCriteria = boost::make_shared<Dictionary>(); query1.WhereCriteria = boost::make_shared<Dictionary>();
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */ query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbObject::OnQuery(query1); DbObject::OnQuery(query1);

9
lib/db_ido/dbconnection.ti
View File

@ -1,3 +1,4 @@
#include "db_ido/dbquery.h"
#include "base/dynamicobject.h" #include "base/dynamicobject.h"
#include <boost/smart_ptr/make_shared.hpp> #include <boost/smart_ptr/make_shared.hpp>
@ -13,6 +14,14 @@ class DbConnection : DynamicObject
[config] Dictionary::Ptr cleanup { [config] Dictionary::Ptr cleanup {
default {{{ return boost::make_shared<Dictionary>(); }}} default {{{ return boost::make_shared<Dictionary>(); }}}
}; };
[config] int categories {
default {{{
return DbCatConfig | DbCatState | DbCatAcknowledgement |
DbCatComment | DbCatDowntime | DbCatEventHandler | DbCatExternalCommand | DbCatFlapping |
DbCatLog | DbCatNotification | DbCatProgramStatus | DbCatRetention | DbCatStateHistory;
}}}
};
}; };
} }