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

Fix: Icinga doesn't send SetLogPosition messages when one of the endpoints fails to connect 

fixes #6537
This commit is contained in:
Gunnar Beutner 2014-06-23 10:00:02 +02:00
parent c4bfff27c7
commit adccc41a8d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/remote/apilistener.cpp
View File

@ -197,12 +197,11 @@ void ApiListener::ListenerThreadProc(const Socket::Ptr& server)
}
/**
* Creates a new JSON-RPC client and connects to the specified host and port.
* Creates a new JSON-RPC client and connects to the specified endpoint.
*
* @param node The remote host.
* @param service The remote port.
* @param endpoint The endpoint.
*/
void ApiListener::AddConnection(const String& node, const String& service)
void ApiListener::AddConnection(const Endpoint::Ptr& endpoint)
{
{
ObjectLock olock(this);
@ -215,14 +214,21 @@ void ApiListener::AddConnection(const String& node, const String& service)
}
}
String host = endpoint->GetHost();
String port = endpoint->GetPort();
TcpSocket::Ptr client = make_shared<TcpSocket>();
try {
client->Connect(node, service);
Utility::QueueAsyncCallback(boost::bind(&ApiListener::NewClientHandler, this, client, RoleClient));
endpoint->SetConnecting(true);
client->Connect(host, port);
NewClientHandler(client, RoleClient);
endpoint->SetConnecting(false);
} catch (const std::exception& ex) {
endpoint->SetConnecting(false);
std::ostringstream info, debug;
info << "Cannot connect to host '" << node << "' on port '" << service << "'";
info << "Cannot connect to host '" << host << "' on port '" << port << "'";
debug << info.str() << std::endl << DiagnosticInformation(ex);
Log(LogCritical, "ApiListener", info.str());
Log(LogDebug, "ApiListener", debug.str());
@ -358,7 +364,7 @@ void ApiListener::ApiTimerHandler(void)
if (endpoint->GetHost().IsEmpty() || endpoint->GetPort().IsEmpty())
continue;
AddConnection(endpoint->GetHost(), endpoint->GetPort());
Utility::QueueAsyncCallback(boost::bind(&ApiListener::AddConnection, this, endpoint));
}
}
}

2
lib/remote/apilistener.hpp
View File

@ -80,7 +80,7 @@ private:
void ApiTimerHandler(void);
void AddListener(const String& service);
void AddConnection(const String& node, const String& service);
void AddConnection(const Endpoint::Ptr& endpoint);
void NewClientHandler(const Socket::Ptr& client, ConnectionRole role);
void ListenerThreadProc(const Socket::Ptr& server);

1
lib/remote/endpoint.ti
View File

@ -16,6 +16,7 @@ class Endpoint : DynamicObject
[state] double local_log_position;
[state] double remote_log_position;
bool connecting;
bool syncing;
};