ido: Clean up obsolete handlers.

diff --git a/lib/ido/dbconnection.cpp b/lib/ido/dbconnection.cpp
index 4c6e790e806d082ec778ae3d4822564e6a53b9b1..0a5ffcaa534194c745f48efa2158414cf6c8ce9c 100644 (file)
--- a/lib/ido/dbconnection.cpp
+++ b/lib/ido/dbconnection.cpp
@@ -37,8 +37,6 @@ void DbConnection::Start(void)
 {
        DynamicObject::Start();
 
-       DbObject::OnRegistered.connect(boost::bind(&DbConnection::ActivateObject, this, _1));
-       DbObject::OnUnregistered.connect(boost::bind(&DbConnection::DeactivateObject, this, _1));
        DbObject::OnQuery.connect(boost::bind(&DbConnection::ExecuteQuery, this, _1));
 }
 

diff --git a/lib/ido/dbobject.cpp b/lib/ido/dbobject.cpp
index 50291f6ebe1ea1c64f9070c119c086f05f37e365..0bd6fa88aa39ec390edca0203de1f29e6b3b11a0 100644 (file)
--- a/lib/ido/dbobject.cpp
+++ b/lib/ido/dbobject.cpp
@@ -30,8 +30,6 @@
 
 using namespace icinga;
 
-boost::signals2::signal<void (const DbObject::Ptr&)> DbObject::OnRegistered;
-boost::signals2::signal<void (const DbObject::Ptr&)> DbObject::OnUnregistered;
 boost::signals2::signal<void (const DbQuery&)> DbObject::OnQuery;
 
 INITIALIZE_ONCE(DbObject, &DbObject::StaticInitialize);
@@ -42,9 +40,6 @@ DbObject::DbObject(const shared_ptr<DbType>& type, const String& name1, const St
 
 void DbObject::StaticInitialize(void)
 {
-       DynamicObject::OnStarted.connect(boost::bind(&DbObject::ObjectStartedHandler, _1));
-       DynamicObject::OnStopped.connect(boost::bind(&DbObject::ObjectStoppedHandler, _1));
-
        DynamicObject::OnStateChanged.connect(boost::bind(&DbObject::StateChangedHandler, _1));
 }
 
@@ -188,34 +183,6 @@ DbObject::Ptr DbObject::GetOrCreateByObject(const DynamicObject::Ptr& object)
        return dbobj;
 }
 
-void DbObject::ObjectStartedHandler(const DynamicObject::Ptr& object)
-{
-       DbObject::Ptr dbobj = GetOrCreateByObject(object);
-
-       if (!dbobj)
-               return;
-
-       OnRegistered(dbobj);
-
-       dbobj->SendConfigUpdate();
-       dbobj->SendStatusUpdate();
-}
-
-void DbObject::ObjectStoppedHandler(const DynamicObject::Ptr& object)
-{
-       DbObject::Ptr dbobj = GetOrCreateByObject(object);
-
-       if (!dbobj)
-               return;
-
-       OnUnregistered(dbobj);
-
-       {
-               ObjectLock olock(object);
-               object->ClearExtension("DbObject");
-       }
-}
-
 void DbObject::StateChangedHandler(const DynamicObject::Ptr& object)
 {
        DbObject::Ptr dbobj = GetOrCreateByObject(object);

diff --git a/lib/ido/dbobject.h b/lib/ido/dbobject.h
index 36ce3b921d93e5afc3469dd4be4e3d710ce2a7d7..e3a6b3d7fe5c967d85b60031214a442469ffa3f2 100644 (file)
--- a/lib/ido/dbobject.h
+++ b/lib/ido/dbobject.h
@@ -75,8 +75,6 @@ public:
 
        static DbObject::Ptr GetOrCreateByObject(const DynamicObject::Ptr& object);
 
-       static boost::signals2::signal<void (const DbObject::Ptr&)> OnRegistered;
-       static boost::signals2::signal<void (const DbObject::Ptr&)> OnUnregistered;
        static boost::signals2::signal<void (const DbQuery&)> OnQuery;
 
        void SendConfigUpdate(void);
@@ -101,8 +99,6 @@ private:
        double m_LastConfigUpdate;
        double m_LastStatusUpdate;
 
-       static void ObjectStartedHandler(const DynamicObject::Ptr& object);
-       static void ObjectStoppedHandler(const DynamicObject::Ptr& object);
        static void StateChangedHandler(const DynamicObject::Ptr& object);
 
        friend class DbType;