]> granicus.if.org Git - icinga2/commitdiff
Fixed incorrect object type.
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 3 Aug 2012 13:35:50 +0000 (15:35 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 3 Aug 2012 13:51:42 +0000 (15:51 +0200)
components/convenience/conveniencecomponent.cpp

index 50d55ac4b5a09c7336ab33f3b9ef103e01f94adf..f8bf2aaa612470ac9071404280ad942bdf50abef 100644 (file)
@@ -70,15 +70,15 @@ static void CopyServiceAttributes(const Host::Ptr& host, TDict serviceDesc,
 
 void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
 {
-       if (item->GetType() != "host")
+       if (item->GetType() != "Host")
                return;
 
-       Host::Ptr host = Host::GetByName(item->GetName());
-
        /* ignore abstract host objects */
-       if (!host)
+       if (!Host::Exists(item->GetName()))
                return;
 
+       Host::Ptr host = Host::GetByName(item->GetName());
+
        Dictionary::Ptr oldServices = host->Get("convenience_services");
 
        Dictionary::Ptr newServices;
@@ -95,7 +95,7 @@ void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
                        String name = namebuf.str();
 
                        ConfigItemBuilder::Ptr builder = boost::make_shared<ConfigItemBuilder>(item->GetDebugInfo());
-                       builder->SetType("service");
+                       builder->SetType("Service");
                        builder->SetName(name);
                        builder->AddExpression("host_name", OperatorSet, item->GetName());
                        builder->AddExpression("alias", OperatorSet, svcname);
@@ -141,7 +141,7 @@ void ConvenienceComponent::HostCommittedHandler(const ConfigItem::Ptr& item)
 
 void ConvenienceComponent::HostRemovedHandler(const ConfigItem::Ptr& item)
 {
-       if (item->GetType() != "host")
+       if (item->GetType() != "Host")
                return;
 
        DynamicObject::Ptr host = item->GetDynamicObject();