tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-05-03 22:20:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move the ClearConfigTables function into the DbConnection class.

Browse Source 
Refs #5565
This commit is contained in:
Gunnar Beutner 2014-01-28 11:09:13 +01:00
parent 6c724d2797
commit 3a23f0110b
6 changed files with 40 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -233,40 +233,6 @@ void IdoMysqlConnection::Reconnect(void)
UpdateAllObjects(); UpdateAllObjects();
} }
void IdoMysqlConnection::ClearConfigTables(void)
{
/* TODO make hardcoded table names modular */
ClearConfigTable("commands");
ClearConfigTable("comments");
ClearConfigTable("contact_addresses");
ClearConfigTable("contact_notificationcommands");
ClearConfigTable("contactgroup_members");
ClearConfigTable("contactgroups");
ClearConfigTable("contacts");
ClearConfigTable("contactstatus");
ClearConfigTable("customvariables");
ClearConfigTable("customvariablestatus");
ClearConfigTable("host_contactgroups");
ClearConfigTable("host_contacts");
ClearConfigTable("host_parenthosts");
ClearConfigTable("hostdependencies");
ClearConfigTable("hostgroup_members");
ClearConfigTable("hostgroups");
ClearConfigTable("hosts");
ClearConfigTable("hoststatus");
ClearConfigTable("programstatus");
ClearConfigTable("scheduleddowntime");
ClearConfigTable("service_contactgroups");
ClearConfigTable("service_contacts");
ClearConfigTable("servicedependencies");
ClearConfigTable("servicegroup_members");
ClearConfigTable("servicegroups");
ClearConfigTable("services");
ClearConfigTable("servicestatus");
ClearConfigTable("timeperiod_timeranges");
ClearConfigTable("timeperiods");
}
void IdoMysqlConnection::ClearConfigTable(const String& table) void IdoMysqlConnection::ClearConfigTable(const String& table)
{ {
Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " + Convert::ToString(static_cast<long>(m_InstanceID))); Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " + Convert::ToString(static_cast<long>(m_InstanceID)));

3
components/db_ido_mysql/idomysqlconnection.h
View File

@ -83,8 +83,7 @@ private:
void InternalExecuteQuery(const DbQuery& query); void InternalExecuteQuery(const DbQuery& query);
void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value); void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
void ClearConfigTables(void); virtual void ClearConfigTable(const String& table);
void ClearConfigTable(const String& table);
void ExceptionHandler(boost::exception_ptr exp); void ExceptionHandler(boost::exception_ptr exp);
}; };

34
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -236,40 +236,6 @@ void IdoPgsqlConnection::Reconnect(void)
UpdateAllObjects(); UpdateAllObjects();
} }
void IdoPgsqlConnection::ClearConfigTables(void)
{
/* TODO make hardcoded table names modular */
ClearConfigTable("commands");
ClearConfigTable("comments");
ClearConfigTable("contact_addresses");
ClearConfigTable("contact_notificationcommands");
ClearConfigTable("contactgroup_members");
ClearConfigTable("contactgroups");
ClearConfigTable("contacts");
ClearConfigTable("contactstatus");
ClearConfigTable("customvariables");
ClearConfigTable("customvariablestatus");
ClearConfigTable("host_contactgroups");
ClearConfigTable("host_contacts");
ClearConfigTable("host_parenthosts");
ClearConfigTable("hostdependencies");
ClearConfigTable("hostgroup_members");
ClearConfigTable("hostgroups");
ClearConfigTable("hosts");
ClearConfigTable("hoststatus");
ClearConfigTable("programstatus");
ClearConfigTable("scheduleddowntime");
ClearConfigTable("service_contactgroups");
ClearConfigTable("service_contacts");
ClearConfigTable("servicedependencies");
ClearConfigTable("servicegroup_members");
ClearConfigTable("servicegroups");
ClearConfigTable("services");
ClearConfigTable("servicestatus");
ClearConfigTable("timeperiod_timeranges");
ClearConfigTable("timeperiods");
}
void IdoPgsqlConnection::ClearConfigTable(const String& table) void IdoPgsqlConnection::ClearConfigTable(const String& table)
{ {
Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " + Convert::ToString(static_cast<long>(m_InstanceID))); Query("DELETE FROM " + GetTablePrefix() + table + " WHERE instance_id = " + Convert::ToString(static_cast<long>(m_InstanceID)));

3
components/db_ido_pgsql/idopgsqlconnection.h
View File

@ -81,8 +81,7 @@ private:
void InternalExecuteQuery(const DbQuery& query); void InternalExecuteQuery(const DbQuery& query);
void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value); void InternalCleanUpExecuteQuery(const String& table, const String& time_key, double time_value);
void ClearConfigTables(void); virtual void ClearConfigTable(const String& table);
void ClearConfigTable(const String& table);
void ExceptionHandler(boost::exception_ptr exp); void ExceptionHandler(boost::exception_ptr exp);
}; };

34
lib/db_ido/dbconnection.cpp
View File

@ -292,3 +292,37 @@ void DbConnection::UpdateAllObjects(void)
} }
} }
} }
void DbConnection::ClearConfigTables(void)
{
/* TODO make hardcoded table names modular */
ClearConfigTable("commands");
ClearConfigTable("comments");
ClearConfigTable("contact_addresses");
ClearConfigTable("contact_notificationcommands");
ClearConfigTable("contactgroup_members");
ClearConfigTable("contactgroups");
ClearConfigTable("contacts");
ClearConfigTable("contactstatus");
ClearConfigTable("customvariables");
ClearConfigTable("customvariablestatus");
ClearConfigTable("host_contactgroups");
ClearConfigTable("host_contacts");
ClearConfigTable("host_parenthosts");
ClearConfigTable("hostdependencies");
ClearConfigTable("hostgroup_members");
ClearConfigTable("hostgroups");
ClearConfigTable("hosts");
ClearConfigTable("hoststatus");
ClearConfigTable("programstatus");
ClearConfigTable("scheduleddowntime");
ClearConfigTable("service_contactgroups");
ClearConfigTable("service_contacts");
ClearConfigTable("servicedependencies");
ClearConfigTable("servicegroup_members");
ClearConfigTable("servicegroups");
ClearConfigTable("services");
ClearConfigTable("servicestatus");
ClearConfigTable("timeperiod_timeranges");
ClearConfigTable("timeperiods");
}

4
lib/db_ido/dbconnection.h
View File

@ -72,6 +72,8 @@ protected:
void UpdateAllObjects(void); void UpdateAllObjects(void);
void ClearConfigTables(void);
private: private:
std::map<DbObject::Ptr, DbReference> m_ObjectIDs; std::map<DbObject::Ptr, DbReference> m_ObjectIDs;
std::map<DbObject::Ptr, DbReference> m_InsertIDs; std::map<DbObject::Ptr, DbReference> m_InsertIDs;
@ -83,6 +85,8 @@ private:
void CleanUpHandler(void); void CleanUpHandler(void);
virtual void ClearConfigTable(const String& table) = 0;
static Timer::Ptr m_ProgramStatusTimer; static Timer::Ptr m_ProgramStatusTimer;
static void InsertRuntimeVariable(const String& key, const Value& value); static void InsertRuntimeVariable(const String& key, const Value& value);