tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DB IDO: Use node name for local status updates. 

Refs #5636
This commit is contained in:
Michael Friedrich 2014-03-20 15:41:45 +01:00
parent 88dafa8eef
commit dfd08ec6ea
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/db_ido/dbobject.cpp
View File

@ -42,7 +42,7 @@ DbObject::DbObject(const shared_ptr<DbType>& type, const String& name1, const St
void DbObject::StaticInitialize(void)
{
/* triggered in ProcessCheckResult(), requires UpdateNextCheck() to be called before */
DynamicObject::OnStateChanged.connect(boost::bind(&DbObject::StateChangedHandler, _1, _2));
DynamicObject::OnStateChanged.connect(boost::bind(&DbObject::StateChangedHandler, _1));
}
void DbObject::SetObject(const DynamicObject::Ptr& object)
@ -96,12 +96,10 @@ void DbObject::SendConfigUpdate(void)
OnConfigUpdate();
}
void DbObject::SendStatusUpdate(const String& authority)
void DbObject::SendStatusUpdate(void)
{
Dictionary::Ptr fields = GetStatusFields();
Endpoint::Ptr endpoint = Endpoint::GetByName(authority);
if (!fields)
return;
@ -113,6 +111,11 @@ void DbObject::SendStatusUpdate(const String& authority)
query.Fields->Set(GetType()->GetIDColumn(), GetObject());
query.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
String node = IcingaApplication::GetInstance()->GetNodeName();
Log(LogWarning, "db_ido", "Endpoint node: '" + node + "'");
Endpoint::Ptr endpoint = Endpoint::GetByName(node);
if (endpoint)
query.Fields->Set("endpoint_object_id", endpoint);
@ -190,12 +193,12 @@ DbObject::Ptr DbObject::GetOrCreateByObject(const DynamicObject::Ptr& object)
return dbobj;
}
void DbObject::StateChangedHandler(const DynamicObject::Ptr& object, const String& authority)
void DbObject::StateChangedHandler(const DynamicObject::Ptr& object)
{
DbObject::Ptr dbobj = GetOrCreateByObject(object);
if (!dbobj)
return;
dbobj->SendStatusUpdate(authority);
dbobj->SendStatusUpdate();
}

4
lib/db_ido/dbobject.h
View File

@ -79,7 +79,7 @@ public:
static boost::signals2::signal<void (const DbQuery&)> OnQuery;
void SendConfigUpdate(void);
void SendStatusUpdate(const String& authority = String());
void SendStatusUpdate(void);
double GetLastConfigUpdate(void) const;
double GetLastStatusUpdate(void) const;
@ -100,7 +100,7 @@ private:
double m_LastConfigUpdate;
double m_LastStatusUpdate;
static void StateChangedHandler(const DynamicObject::Ptr& object, const String& authority);
static void StateChangedHandler(const DynamicObject::Ptr& object);
friend class DbType;
};