Bugfixes.

This commit is contained in:
Gunnar Beutner 2012-06-14 21:09:35 +02:00
parent ac7d8688a8
commit d52afa080e
4 changed files with 15 additions and 5 deletions

View File

@ -69,7 +69,6 @@ int CheckerComponent::CheckTimerHandler(const TimerEventArgs& ea)
return 0;
for (;;) {
Service service = m_Services.top();
if (service.GetNextCheck() > now)

View File

@ -86,7 +86,7 @@ int DelegationComponent::AssignServiceResponseHandler(const ConfigObject::Ptr& s
Application::Log("Service delegation for service '" + service->GetName() + "' timed out.");
} else {
service->SetTag("checker", nrea.Sender->GetIdentity());
Application::Log("Service delegation for service '" + service->GetName() + "'was successful.");
Application::Log("Service delegation for service '" + service->GetName() + "' was successful.");
}
return 0;

View File

@ -24,6 +24,7 @@ icinga_LDADD = \
-dlopen ${top_builddir}/components/checker/checker.la \
-dlopen ${top_builddir}/components/configfile/configfile.la \
-dlopen ${top_builddir}/components/configrpc/configrpc.la \
-dlopen ${top_builddir}/components/delegation/delegation.la \
-dlopen ${top_builddir}/components/demo/demo.la \
-dlopen ${top_builddir}/components/discovery/discovery.la

View File

@ -13,6 +13,9 @@ local object component "configrpc" {
local object component "delegation" {
}
local object component "checker" {
}
local object component "discovery" {
broker = 1
}
@ -44,9 +47,16 @@ abstract object service "nagios-service" {
}
abstract object service "ping" inherits "nagios-service" {
check_type = "nagios",
check_command = "$plugindir$/check_ping -H $address$",
check_interval = 30
check_command = "$plugindir$/check_ping -H $address$ -c $crta$,$cpl$% -w $wrta$,$wpl$%",
check_interval = 30,
macros += {
crta = 100,
wrta = 50,
cpl = 25,
wpl = 5
}
}
object service "localhost-ping" inherits "ping" {