tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-01 10:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compat IDO: make sending of data serialized (refs #3257), always send hello

Browse Source
This commit is contained in:
Michael Friedrich 2012-10-07 22:20:54 +02:00
parent d42dd6e03f
commit 87ae4f4642
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/compatido/compatidocomponent.cpp
View File

@ -95,23 +95,49 @@ void CompatIdoComponent::Start(void)
* - only icinga idoutils 1.8 * - only icinga idoutils 1.8
* - only "retained" config * - only "retained" config
*/ */
/*
* open ido socket once
*/
OpenIdoSocket();
/*
* full config dump at startup, wait for it
*/
Logger::Write(LogInformation, "compatido", "Writing compat ido config information");
DumpConfigObjects();
/*
* initialize timers
*/
m_StatusTimer = boost::make_shared<Timer>(); m_StatusTimer = boost::make_shared<Timer>();
m_StatusTimer->SetInterval(StatusTimerInterval); m_StatusTimer->SetInterval(StatusTimerInterval);
m_StatusTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::StatusTimerHandler, this)); m_StatusTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::StatusTimerHandler, this));
m_StatusTimer->Start(); m_StatusTimer->Start();
m_StatusTimer->Reschedule(0); m_StatusTimer->Reschedule(0);
/*
* do not dump configs in intervals, only on startup
* TODO trigger dynaamic config updates later
*/
/*
m_ConfigTimer = boost::make_shared<Timer>(); m_ConfigTimer = boost::make_shared<Timer>();
m_ConfigTimer->SetInterval(ConfigTimerInterval); m_ConfigTimer->SetInterval(ConfigTimerInterval);
m_ConfigTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ConfigTimerHandler, this)); m_ConfigTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ConfigTimerHandler, this));
m_ConfigTimer->Start(); m_ConfigTimer->Start();
m_ConfigTimer->Reschedule(0); */
/*
* do not dummp that asynchronous
* TODO do that on dynamic updates for objects
*/
/*
m_ProgramStatusTimer = boost::make_shared<Timer>(); m_ProgramStatusTimer = boost::make_shared<Timer>();
m_ProgramStatusTimer->SetInterval(ProgramStatusTimerInterval); m_ProgramStatusTimer->SetInterval(ProgramStatusTimerInterval);
m_ProgramStatusTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ProgramStatusTimerHandler, this)); m_ProgramStatusTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ProgramStatusTimerHandler, this));
m_ProgramStatusTimer->Start(); m_ProgramStatusTimer->Start();
m_ProgramStatusTimer->Reschedule(0); m_ProgramStatusTimer->Reschedule(0);
*/
/* /*
* scheck for reconnect once in a while * scheck for reconnect once in a while
@ -120,10 +146,6 @@ void CompatIdoComponent::Start(void)
m_ReconnectTimer->SetInterval(ReconnectTimerInterval); m_ReconnectTimer->SetInterval(ReconnectTimerInterval);
m_ReconnectTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ReconnectTimerHandler, this)); m_ReconnectTimer->OnTimerExpired.connect(boost::bind(&CompatIdoComponent::ReconnectTimerHandler, this));
m_ReconnectTimer->Start(); m_ReconnectTimer->Start();
/*
* open ido socket once
*/
OpenIdoSocket();
} }
@ -142,15 +164,13 @@ void CompatIdoComponent::Stop(void)
void CompatIdoComponent::OpenIdoSocket(void) void CompatIdoComponent::OpenIdoSocket(void)
{ {
OpenSink(GetSocketAddress(), GetSocketPort()); OpenSink(GetSocketAddress(), GetSocketPort());
SendHello(GetInstanceName());
/* /*
* if we're connected, do not reconnecte * if we're connected, do not reconnecte
*/ */
if(m_IdoSocket->IsConnected()) { if(m_IdoSocket->IsConnected()) {
m_IdoSocket->SetReconnect(false); m_IdoSocket->SetReconnect(false);
/* connected means we can greet ido2db */
SendHello(GetInstanceName());
} else { } else {
m_IdoSocket->SetReconnect(true); m_IdoSocket->SetReconnect(true);
} }
@ -181,6 +201,7 @@ void CompatIdoComponent::StatusTimerHandler(void)
Logger::Write(LogInformation, "compatido", "Writing compat ido status information"); Logger::Write(LogInformation, "compatido", "Writing compat ido status information");
DumpStatusData(); DumpStatusData();
DumpProgramStatusData();
} }
/** /**