Build fix.

components/db_ido_mysql/Makefile.am

@@ -2,27 +2,27 @@
 
 if MYSQL_USE
 pkglib_LTLIBRARIES = \
-	libido_mysql.la
+	libdb_ido_mysql.la
 
 CLEANFILES = \
-	ido_mysql-type.cpp
+	db_ido_mysql-type.cpp
 
 .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
-libido_mysql_la_SOURCES = \
-	ido_mysql-type.conf \
-	idomysqldbconnection.cpp \
-	idomysqldbconnection.h
+libdb_ido_mysql_la_SOURCES = \
+	db_ido_mysql-type.conf \
+	idomysqlconnection.cpp \
+	idomysqlconnection.h
 
-libido_mysql_la_CPPFLAGS = \
+libdb_ido_mysql_la_CPPFLAGS = \
 	$(LTDLINCL) \
 	$(BOOST_CPPFLAGS) \
 	$(MYSQL_CFLAGS) \
 	-I${top_srcdir}/lib \
 	-I${top_srcdir}/components
 
-libido_mysql_la_LDFLAGS = \
+libdb_ido_mysql_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
 	$(MYSQLR_LDFLAGS) \
 	-module \
@@ -30,14 +30,14 @@ libido_mysql_la_LDFLAGS = \
 	@RELEASE_INFO@ \
 	@VERSION_INFO@
 
-libido_mysql_la_LIBADD = \
+libdb_ido_mysql_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
 	$(BOOST_SYSTEM_LIB) \
 	${top_builddir}/lib/base/libbase.la \
 	${top_builddir}/lib/config/libconfig.la \
 	${top_builddir}/lib/icinga/libicinga.la \
-	${top_builddir}/lib/ido/libido.la
+	${top_builddir}/lib/db_ido/libdb_ido.la
 
 else
 

components/db_ido_mysql/idomysqlconnection.cpp

@@ -21,18 +21,18 @@
 #include "base/objectlock.h"
 #include "base/convert.h"
 #include "base/utility.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
-#include "ido_mysql/idomysqldbconnection.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
+#include "db_ido_mysql/idomysqlconnection.h"
 #include <boost/tuple/tuple.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/foreach.hpp>
 
 using namespace icinga;
 
-REGISTER_TYPE(IdoMysqlDbConnection);
+REGISTER_TYPE(IdoMysqlConnection);
 
-void IdoMysqlDbConnection::Start(void)
+void IdoMysqlConnection::Start(void)
 {
 	DbConnection::Start();
 
@@ -40,18 +40,18 @@ void IdoMysqlDbConnection::Start(void)
 
 	m_TxTimer = boost::make_shared<Timer>();
 	m_TxTimer->SetInterval(5);
-	m_TxTimer->OnTimerExpired.connect(boost::bind(&IdoMysqlDbConnection::TxTimerHandler, this));
+	m_TxTimer->OnTimerExpired.connect(boost::bind(&IdoMysqlConnection::TxTimerHandler, this));
 	m_TxTimer->Start();
 
 	m_ReconnectTimer = boost::make_shared<Timer>();
 	m_ReconnectTimer->SetInterval(10);
-	m_ReconnectTimer->OnTimerExpired.connect(boost::bind(&IdoMysqlDbConnection::ReconnectTimerHandler, this));
+	m_ReconnectTimer->OnTimerExpired.connect(boost::bind(&IdoMysqlConnection::ReconnectTimerHandler, this));
 	m_ReconnectTimer->Start();
 
 	ASSERT(mysql_thread_safe());
 }
 
-void IdoMysqlDbConnection::Stop(void)
+void IdoMysqlConnection::Stop(void)
 {
 	boost::mutex::scoped_lock lock(m_ConnectionMutex);
 
@@ -64,7 +64,7 @@ void IdoMysqlDbConnection::Stop(void)
 	m_Connected = false;
 }
 
-void IdoMysqlDbConnection::TxTimerHandler(void)
+void IdoMysqlConnection::TxTimerHandler(void)
 {
 	boost::mutex::scoped_lock lock(m_ConnectionMutex);
 
@@ -75,7 +75,7 @@ void IdoMysqlDbConnection::TxTimerHandler(void)
 	Query("BEGIN");
 }
 
-void IdoMysqlDbConnection::ReconnectTimerHandler(void)
+void IdoMysqlConnection::ReconnectTimerHandler(void)
 {
 	{
 		boost::mutex::scoped_lock lock(m_ConnectionMutex);
@@ -156,7 +156,7 @@ void IdoMysqlDbConnection::ReconnectTimerHandler(void)
 	UpdateAllObjects();
 }
 
-void IdoMysqlDbConnection::ClearConfigTables(void)
+void IdoMysqlConnection::ClearConfigTables(void)
 {
 	/* TODO make hardcoded table names modular */
 	ClearConfigTable("commands");
@@ -183,12 +183,12 @@ void IdoMysqlDbConnection::ClearConfigTables(void)
 	ClearConfigTable("timeperiods");
 }
 
-void IdoMysqlDbConnection::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)));
 }
 
-Array::Ptr IdoMysqlDbConnection::Query(const String& query)
+Array::Ptr IdoMysqlConnection::Query(const String& query)
 {
 	Log(LogDebug, "ido_mysql", "Query: " + query);
 
@@ -220,12 +220,12 @@ Array::Ptr IdoMysqlDbConnection::Query(const String& query)
 	return rows;
 }
 
-DbReference IdoMysqlDbConnection::GetLastInsertID(void)
+DbReference IdoMysqlConnection::GetLastInsertID(void)
 {
 	return DbReference(mysql_insert_id(&m_Connection));
 }
 
-String IdoMysqlDbConnection::Escape(const String& s)
+String IdoMysqlConnection::Escape(const String& s)
 {
 	ssize_t length = s.GetLength();
 	char *to = new char[s.GetLength() * 2 + 1];
@@ -239,7 +239,7 @@ String IdoMysqlDbConnection::Escape(const String& s)
 	return result;
 }
 
-Dictionary::Ptr IdoMysqlDbConnection::FetchRow(MYSQL_RES *result)
+Dictionary::Ptr IdoMysqlConnection::FetchRow(MYSQL_RES *result)
 {
 	MYSQL_ROW row;
 	MYSQL_FIELD *field;
@@ -270,13 +270,13 @@ Dictionary::Ptr IdoMysqlDbConnection::FetchRow(MYSQL_RES *result)
 	return dict;
 }
 
-void IdoMysqlDbConnection::ActivateObject(const DbObject::Ptr& dbobj)
+void IdoMysqlConnection::ActivateObject(const DbObject::Ptr& dbobj)
 {
 	boost::mutex::scoped_lock lock(m_ConnectionMutex);
 	InternalActivateObject(dbobj);
 }
 
-void IdoMysqlDbConnection::InternalActivateObject(const DbObject::Ptr& dbobj)
+void IdoMysqlConnection::InternalActivateObject(const DbObject::Ptr& dbobj)
 {
 	if (!m_Connected)
 		return;
@@ -296,7 +296,7 @@ void IdoMysqlDbConnection::InternalActivateObject(const DbObject::Ptr& dbobj)
 	}
 }
 
-void IdoMysqlDbConnection::DeactivateObject(const DbObject::Ptr& dbobj)
+void IdoMysqlConnection::DeactivateObject(const DbObject::Ptr& dbobj)
 {
 	boost::mutex::scoped_lock lock(m_ConnectionMutex);
 
@@ -317,7 +317,7 @@ void IdoMysqlDbConnection::DeactivateObject(const DbObject::Ptr& dbobj)
 }
 
 /* caller must hold m_ConnectionMutex */
-bool IdoMysqlDbConnection::FieldToEscapedString(const String& key, const Value& value, Value *result)
+bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& value, Value *result)
 {
 	if (key == "instance_id") {
 		*result = static_cast<long>(m_InstanceID);
@@ -368,7 +368,7 @@ bool IdoMysqlDbConnection::FieldToEscapedString(const String& key, const Value&
 	return true;
 }
 
-void IdoMysqlDbConnection::ExecuteQuery(const DbQuery& query)
+void IdoMysqlConnection::ExecuteQuery(const DbQuery& query)
 {
 	boost::mutex::scoped_lock lock(m_ConnectionMutex);
 
@@ -489,7 +489,7 @@ void IdoMysqlDbConnection::ExecuteQuery(const DbQuery& query)
 	}
 }
 
-void IdoMysqlDbConnection::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
+void IdoMysqlConnection::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
 {
 	DbConnection::InternalSerialize(bag, attributeTypes);
 
@@ -504,7 +504,7 @@ void IdoMysqlDbConnection::InternalSerialize(const Dictionary::Ptr& bag, int att
 	}
 }
 
-void IdoMysqlDbConnection::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
+void IdoMysqlConnection::InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes)
 {
 	DbConnection::InternalDeserialize(bag, attributeTypes);
 

components/db_ido_mysql/idomysqlconnection.h

@@ -17,13 +17,13 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef IDOMYSQLDBCONNECTION_H
-#define IDOMYSQLDBCONNECTION_H
+#ifndef IDOMYSQLCONNECTION_H
+#define IDOMYSQLCONNECTION_H
 
 #include "base/array.h"
 #include "base/dynamictype.h"
 #include "base/timer.h"
-#include "ido/dbconnection.h"
+#include "db_ido/dbconnection.h"
 #include <mysql/mysql.h>
 
 namespace icinga
@@ -34,10 +34,10 @@ namespace icinga
  *
  * @ingroup ido
  */
-class IdoMysqlDbConnection : public DbConnection
+class IdoMysqlConnection : public DbConnection
 {
 public:
-	DECLARE_PTR_TYPEDEFS(IdoMysqlDbConnection);
+	DECLARE_PTR_TYPEDEFS(IdoMysqlConnection);
 
 	//virtual void UpdateObject(const DbObject::Ptr& dbobj, DbUpdateType kind);
 
@@ -87,4 +87,4 @@ private:
 
 }
 
-#endif /* IDOMYSQLDBCONNECTION_H */
+#endif /* IDOMYSQLCONNECTION_H */

icinga-app/Makefile.am

@@ -29,6 +29,7 @@ icinga2_LDADD = \
 	-dlopen ${top_builddir}/components/checker/libchecker.la \
 	-dlopen ${top_builddir}/components/cluster/libcluster.la \
 	-dlopen ${top_builddir}/components/compat/libcompat.la \
+	-dlopen ${top_builddir}/components/db_ido_mysql/libdb_ido_mysql.la \
 	-dlopen ${top_builddir}/components/demo/libdemo.la \
 	-dlopen ${top_builddir}/components/livestatus/liblivestatus.la \
 	-dlopen ${top_builddir}/components/notification/libnotification.la

lib/db_ido/Makefile.am

@@ -1,15 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
 pkglib_LTLIBRARIES = \
-	libido.la
+	libdb_ido.la
 
 CLEANFILES = \
-	ido-type.cpp
+	db_ido-type.cpp
 
 .conf.cpp: $(top_builddir)/tools/mkembedconfig/mkembedconfig
 	$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
 
-libido_la_SOURCES = \
+libdb_ido_la_SOURCES = \
 	commanddbobject.cpp \
 	commanddbobject.h \
 	dbconnection.cpp \
@@ -28,7 +28,7 @@ libido_la_SOURCES = \
 	hostdbobject.h \
 	hostgroupdbobject.cpp \
 	hostgroupdbobject.h \
-	ido-type.conf \
+	db_ido-type.conf \
 	servicedbobject.cpp \
 	servicedbobject.h \
 	servicegroupdbobject.cpp \
@@ -40,18 +40,18 @@ libido_la_SOURCES = \
 	usergroupdbobject.cpp \
 	usergroupdbobject.h
 
-libido_la_CPPFLAGS = \
+libdb_ido_la_CPPFLAGS = \
 	$(LTDLINCL) \
 	$(BOOST_CPPFLAGS) \
 	-I${top_srcdir}/lib
 
-libido_la_LDFLAGS = \
+libdb_ido_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
 	-no-undefined \
 	@RELEASE_INFO@ \
 	@VERSION_INFO@
 
-libido_la_LIBADD = \
+libdb_ido_la_LIBADD = \
 	$(BOOST_SIGNALS_LIB) \
 	$(BOOST_THREAD_LIB) \
 	$(BOOST_SYSTEM_LIB) \

lib/db_ido/commanddbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/commanddbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/commanddbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/command.h"
 #include "icinga/compatutility.h"
 #include "base/objectlock.h"

lib/db_ido/commanddbobject.h

@@ -20,7 +20,7 @@
 #ifndef COMMANDDBOBJECT_H
 #define COMMANDDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "base/dynamicobject.h"
 
 namespace icinga

lib/db_ido/dbconnection.cpp

@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/dbconnection.h"
-#include "ido/dbvalue.h"
+#include "db_ido/dbconnection.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/icingaapplication.h"
 #include "icinga/host.h"
 #include "icinga/service.h"

lib/db_ido/dbconnection.h

@@ -22,8 +22,8 @@
 
 #include "base/dynamicobject.h"
 #include "base/timer.h"
-#include "ido/dbobject.h"
-#include "ido/dbquery.h"
+#include "db_ido/dbobject.h"
+#include "db_ido/dbquery.h"
 
 namespace icinga
 {

lib/db_ido/dbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/dbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/dbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/service.h"
 #include "base/dynamictype.h"
 #include "base/objectlock.h"

lib/db_ido/dbobject.h

@@ -20,9 +20,9 @@
 #ifndef DBOBJECT_H
 #define DBOBJECT_H
 
-#include "ido/dbreference.h"
-#include "ido/dbquery.h"
-#include "ido/dbtype.h"
+#include "db_ido/dbreference.h"
+#include "db_ido/dbquery.h"
+#include "db_ido/dbtype.h"
 #include "base/dynamicobject.h"
 #include <boost/smart_ptr.hpp>
 

lib/db_ido/dbquery.cpp

@@ -17,6 +17,6 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/dbquery.h"
+#include "db_ido/dbquery.h"
 
 using namespace icinga;

lib/db_ido/dbtype.cpp

@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/dbtype.h"
-#include "ido/dbconnection.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbconnection.h"
 #include "base/objectlock.h"
 #include "base/debug.h"
 #include <boost/thread/once.hpp>

lib/db_ido/dbvalue.cpp

@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/dbvalue.h"
+#include "db_ido/dbvalue.h"
 
 using namespace icinga;
 

lib/db_ido/hostdbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/hostdbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/hostdbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/host.h"
 #include "icinga/service.h"
 #include "icinga/notification.h"

lib/db_ido/hostdbobject.h

@@ -20,7 +20,7 @@
 #ifndef HOSTDBOBJECT_H
 #define HOSTDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "base/dynamicobject.h"
 
 namespace icinga

lib/db_ido/hostgroupdbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/hostgroupdbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/hostgroupdbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "base/objectlock.h"
 #include "base/initialize.h"
 #include "base/dynamictype.h"

lib/db_ido/hostgroupdbobject.h

@@ -20,7 +20,7 @@
 #ifndef HOSTGROUPDBOBJECT_H
 #define HOSTGROUPDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "icinga/hostgroup.h"
 #include "base/dynamicobject.h"
 

lib/db_ido/servicedbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/servicedbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/servicedbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "base/convert.h"
 #include "base/objectlock.h"
 #include "base/initialize.h"

lib/db_ido/servicedbobject.h

@@ -20,7 +20,7 @@
 #ifndef SERVICEDBOBJECT_H
 #define SERVICEDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "base/dynamicobject.h"
 #include "icinga/service.h"
 

lib/db_ido/servicegroupdbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/servicegroupdbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/servicegroupdbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "base/objectlock.h"
 #include "base/initialize.h"
 #include <boost/foreach.hpp>

lib/db_ido/servicegroupdbobject.h

@@ -20,7 +20,7 @@
 #ifndef SERVICEGROUPDBOBJECT_H
 #define SERVICEGROUPDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "icinga/servicegroup.h"
 #include "base/dynamicobject.h"
 

lib/db_ido/timeperioddbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/timeperioddbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/timeperioddbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/timeperiod.h"
 #include "icinga/legacytimeperiod.h"
 #include "base/utility.h"

lib/db_ido/timeperioddbobject.h

@@ -20,7 +20,7 @@
 #ifndef TIMEPERIODDBOBJECT_H
 #define TIMEPERIODDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "base/dynamicobject.h"
 
 namespace icinga

lib/db_ido/userdbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/userdbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/userdbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "icinga/user.h"
 #include "icinga/notification.h"
 #include "base/objectlock.h"

lib/db_ido/userdbobject.h

@@ -20,7 +20,7 @@
 #ifndef USERDBOBJECT_H
 #define USERDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "base/dynamicobject.h"
 
 namespace icinga

lib/db_ido/usergroupdbobject.cpp

@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "ido/usergroupdbobject.h"
-#include "ido/dbtype.h"
-#include "ido/dbvalue.h"
+#include "db_ido/usergroupdbobject.h"
+#include "db_ido/dbtype.h"
+#include "db_ido/dbvalue.h"
 #include "base/objectlock.h"
 #include "base/initialize.h"
 #include "base/dynamictype.h"

lib/db_ido/usergroupdbobject.h

@@ -20,7 +20,7 @@
 #ifndef USERGROUPDBOBJECT_H
 #define USERGROUPDBOBJECT_H
 
-#include "ido/dbobject.h"
+#include "db_ido/dbobject.h"
 #include "icinga/usergroup.h"
 #include "base/dynamicobject.h"