Move the VMFrame class to libbase

[icinga2] / lib / icinga / servicegroup.cpp

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index e1fd62c5ae510c26c6d77b94d200e1e5c8a3f3ae..e205c7dd5dd1e76e3c03b7a4e7272532a65875c3 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -17,13 +17,14 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/servicegroup.h"
-#include "config/objectrule.h"
-#include "base/dynamictype.h"
-#include "base/objectlock.h"
-#include "base/logger_fwd.h"
-#include "base/context.h"
-#include "base/workqueue.h"
+#include "icinga/servicegroup.hpp"
+#include "config/objectrule.hpp"
+#include "config/configitem.hpp"
+#include "base/dynamictype.hpp"
+#include "base/objectlock.hpp"
+#include "base/logger.hpp"
+#include "base/context.hpp"
+#include "base/workqueue.hpp"
 #include <boost/foreach.hpp>
 
 using namespace icinga;
@@ -34,65 +35,46 @@ INITIALIZE_ONCE(&ServiceGroup::RegisterObjectRuleHandler);
 
 void ServiceGroup::RegisterObjectRuleHandler(void)
 {
-        ObjectRule::RegisterType("ServiceGroup", &ServiceGroup::EvaluateObjectRules);
+       ObjectRule::RegisterType("ServiceGroup");
 }
 
-bool ServiceGroup::EvaluateObjectRuleOne(const Service::Ptr service, const ObjectRule& rule)
+bool ServiceGroup::EvaluateObjectRule(const Service::Ptr& service, const ConfigItem::Ptr& group)
 {
-       DebugInfo di = rule.GetDebugInfo();
+       String group_name = group->GetName();
 
-       std::ostringstream msgbuf;
-       msgbuf << "Evaluating 'object' rule (" << di << ")";
-       CONTEXT(msgbuf.str());
+       CONTEXT("Evaluating rule for group '" + group_name + "'");
 
        Host::Ptr host = service->GetHost();
 
-       Dictionary::Ptr locals = make_shared<Dictionary>();
-       locals->Set("host", host);
-       locals->Set("service", service);
+       ScriptFrame frame;
+       if (group->GetScope())
+               group->GetScope()->CopyTo(frame.Locals);
+       frame.Locals->Set("host", host);
+       frame.Locals->Set("service", service);
 
-       if (!rule.EvaluateFilter(locals))
+       if (!group->GetFilter()->Evaluate(frame))
                return false;
 
-       std::ostringstream msgbuf2;
-       msgbuf2 << "Assigning membership for group '" << rule.GetName() << "' to service '" << service->GetName() << "' for rule " << di;
-       Log(LogDebug, "icinga", msgbuf2.str());
+       Log(LogDebug, "ServiceGroup")
+           << "Assigning membership for group '" << group_name << "' to service '" << service->GetName() << "'";
 
-       String group_name = rule.GetName();
-       ServiceGroup::Ptr group = ServiceGroup::GetByName(group_name);
-
-       if (!group) {
-               Log(LogCritical, "icinga", "Invalid membership assignment. Group '" + group_name + "' does not exist.");
-               return false;
-       }
-
-       /* assign service group membership */
-       group->ResolveGroupMembership(service, true);
-
-       /* update groups attribute for apply */
-       service->AddGroup(group_name);
+       Array::Ptr groups = service->GetGroups();
+       groups->Add(group_name);
 
        return true;
 }
 
-void ServiceGroup::EvaluateObjectRule(const ObjectRule& rule)
+void ServiceGroup::EvaluateObjectRules(const Service::Ptr& service)
 {
-       BOOST_FOREACH(const Service::Ptr& service, DynamicType::GetObjects<Service>()) {
-               CONTEXT("Evaluating group membership in '" + rule.GetName() + "' for service '" + service->GetName() + "'");
+       CONTEXT("Evaluating group membership for service '" + service->GetName() + "'");
 
-               EvaluateObjectRuleOne(service, rule);
-       }
-}
-
-void ServiceGroup::EvaluateObjectRules(const std::vector<ObjectRule>& rules)
-{
-       ParallelWorkQueue upq;
+       BOOST_FOREACH(const ConfigItem::Ptr& group, ConfigItem::GetItems("ServiceGroup"))
+       {
+               if (!group->GetFilter())
+                       continue;
 
-       BOOST_FOREACH(const ObjectRule& rule, rules) {
-               upq.Enqueue(boost::bind(ServiceGroup::EvaluateObjectRule, boost::cref(rule)));
+               EvaluateObjectRule(service, group);
        }
-
-       upq.Join();
 }
 
 std::set<Service::Ptr> ServiceGroup::GetMembers(void) const
@@ -103,6 +85,8 @@ std::set<Service::Ptr> ServiceGroup::GetMembers(void) const
 
 void ServiceGroup::AddMember(const Service::Ptr& service)
 {
+       service->AddGroup(GetName());
+
        boost::mutex::scoped_lock lock(m_ServiceGroupMutex);
        m_Members.insert(service);
 }
@@ -113,11 +97,12 @@ void ServiceGroup::RemoveMember(const Service::Ptr& service)
        m_Members.erase(service);
 }
 
-bool ServiceGroup::ResolveGroupMembership(Service::Ptr const& service, bool add, int rstack) {
+bool ServiceGroup::ResolveGroupMembership(const Service::Ptr& service, bool add, int rstack) {
 
        if (add && rstack > 20) {
-               Log(LogWarning, "icinga", "Too many nested groups for group '" + GetName() + "': Service '" +
-                   service->GetName() + "' membership assignment failed.");
+               Log(LogWarning, "ServiceGroup")
+                   << "Too many nested groups for group '" << GetName() << "': Service '"
+                   << service->GetName() << "' membership assignment failed.";
 
                return false;
        }