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

Bail early if ApiListener cannot be started

Browse Source 
refs #6682
This commit is contained in:
Michael Friedrich 2014-08-04 16:34:17 +02:00
parent 55c306796b
commit 51329f0b3c
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/remote/apilistener.cpp
View File

@ -102,7 +102,10 @@ void ApiListener::Start(void)
} }
/* create the primary JSON-RPC listener */ /* create the primary JSON-RPC listener */
AddListener(GetBindPort()); if (!AddListener(GetBindPort())) {
Log(LogCritical, "ApiListener", "Cannot add listener for port '" + Convert::ToString(GetBindPort()) + "'.");
Application::Exit(EXIT_FAILURE);
}
m_Timer = make_shared<Timer>(); m_Timer = make_shared<Timer>();
m_Timer->OnTimerExpired.connect(boost::bind(&ApiListener::ApiTimerHandler, this)); m_Timer->OnTimerExpired.connect(boost::bind(&ApiListener::ApiTimerHandler, this));
@ -129,6 +132,10 @@ shared_ptr<SSL_CTX> ApiListener::GetSSLContext(void) const
Endpoint::Ptr ApiListener::GetMaster(void) const Endpoint::Ptr ApiListener::GetMaster(void) const
{ {
Zone::Ptr zone = Zone::GetLocalZone(); Zone::Ptr zone = Zone::GetLocalZone();
if (!zone)
return Endpoint::Ptr();
std::vector<String> names; std::vector<String> names;
BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints())
@ -142,7 +149,12 @@ Endpoint::Ptr ApiListener::GetMaster(void) const
bool ApiListener::IsMaster(void) const bool ApiListener::IsMaster(void) const
{ {
return GetMaster()->GetName() == GetIdentity(); Endpoint::Ptr master = GetMaster();
if (!master)
return false;
return master->GetName() == GetIdentity();
} }
/** /**
@ -150,7 +162,7 @@ bool ApiListener::IsMaster(void) const
* *
* @param service The port to listen on. * @param service The port to listen on.
*/ */
void ApiListener::AddListener(const String& service) bool ApiListener::AddListener(const String& service)
{ {
ObjectLock olock(this); ObjectLock olock(this);
@ -158,7 +170,7 @@ void ApiListener::AddListener(const String& service)
if (!sslContext) { if (!sslContext) {
Log(LogCritical, "ApiListener", "SSL context is required for AddListener()"); Log(LogCritical, "ApiListener", "SSL context is required for AddListener()");
return; return false;
} }
std::ostringstream s; std::ostringstream s;
@ -171,13 +183,15 @@ void ApiListener::AddListener(const String& service)
server->Bind(service, AF_UNSPEC); server->Bind(service, AF_UNSPEC);
} catch(std::exception&) { } catch(std::exception&) {
Log(LogCritical, "ApiListener", "Cannot bind tcp socket on '" + service + "'."); Log(LogCritical, "ApiListener", "Cannot bind tcp socket on '" + service + "'.");
return; return false;
} }
boost::thread thread(boost::bind(&ApiListener::ListenerThreadProc, this, server)); boost::thread thread(boost::bind(&ApiListener::ListenerThreadProc, this, server));
thread.detach(); thread.detach();
m_Servers.insert(server); m_Servers.insert(server);
return true;
} }
void ApiListener::ListenerThreadProc(const Socket::Ptr& server) void ApiListener::ListenerThreadProc(const Socket::Ptr& server)
@ -209,7 +223,7 @@ void ApiListener::AddConnection(const Endpoint::Ptr& endpoint)
shared_ptr<SSL_CTX> sslContext = m_SSLContext; shared_ptr<SSL_CTX> sslContext = m_SSLContext;
if (!sslContext) { if (!sslContext) {
Log(LogCritical, "ApiListener", "SSL context is required for AddListener()"); Log(LogCritical, "ApiListener", "SSL context is required for AddConnection()");
return; return;
} }
} }
@ -398,7 +412,10 @@ void ApiListener::ApiTimerHandler(void)
Utility::FormatDateTime("%Y/%m/%d %H:%M:%S", ts)); Utility::FormatDateTime("%Y/%m/%d %H:%M:%S", ts));
} }
Log(LogNotice, "ApiListener", "Current zone master: " + GetMaster()->GetName()); Endpoint::Ptr master = GetMaster();
if (master)
Log(LogNotice, "ApiListener", "Current zone master: " + master->GetName());
std::vector<String> names; std::vector<String> names;
BOOST_FOREACH(const Endpoint::Ptr& endpoint, DynamicType::GetObjects<Endpoint>()) BOOST_FOREACH(const Endpoint::Ptr& endpoint, DynamicType::GetObjects<Endpoint>())

2
lib/remote/apilistener.hpp
View File

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

3
lib/remote/authority.cpp
View File

@ -42,6 +42,9 @@ static void AuthorityTimerHandler(void)
return; return;
Zone::Ptr my_zone = Zone::GetLocalZone(); Zone::Ptr my_zone = Zone::GetLocalZone();
if (!my_zone)
return;
Endpoint::Ptr my_endpoint = Endpoint::GetLocalEndpoint(); Endpoint::Ptr my_endpoint = Endpoint::GetLocalEndpoint();
std::vector<Endpoint::Ptr> endpoints; std::vector<Endpoint::Ptr> endpoints;