IcingaService(Legacy): Fix duplicated rendering of apply

refs #13049
Icinga · Nov 15, 2016 · 4e5dfb0 · 4e5dfb0
1 parent b40cfd5
commit 4e5dfb0
Showing 1 changed file with 6 additions and 21 deletions.
diff --git a/library/Director/Objects/IcingaService.php b/library/Director/Objects/IcingaService.php
@@ -194,9 +194,11 @@ protected function renderLegacyApplyToConfig(IcingaConfig $config)
     {
         $conn = $this->getConnection();
 
-        $filter = Filter::fromQueryString($this->get('assign_filter'));
+        $assign_filter = $this->get('assign_filter');
+        $filter = Filter::fromQueryString($assign_filter);
         $hosts = HostApplyMatches::forFilter($filter, $conn);
         $this->set('object_type', 'object');
+        $this->set('assign_filter', null);
 
         foreach ($hosts as $hostname) {
             $file = $this->legacyHostnameServicesFile($hostname, $config);
@@ -206,6 +208,7 @@ protected function renderLegacyApplyToConfig(IcingaConfig $config)
 
         $this->set('host', null);
         $this->set('object_type', 'apply');
+        $this->set('assign_filter', $assign_filter);
     }
 
     protected function legacyHostnameServicesFile($hostname, IcingaConfig $config)
@@ -223,8 +226,8 @@ public function toLegacyConfigString()
             return '';
         }
 
-        if ($this->get('assign_filter') !== null) {
-            return $this->renderLegacyResolvedAssignFilter();
+        if ($this->isApplyRule()) {
+            throw new ProgrammingError('Apply Services can not be rendered directly.');
         }
 
         $str = parent::toLegacyConfigString();
@@ -239,24 +242,6 @@ public function toLegacyConfigString()
         }
     }
 
-    protected function renderLegacyResolvedAssignFilter()
-    {
-        $str = '';
-        $hosts = HostApplyMatches::forFilter(
-            Filter::fromQueryString($this->get('assign_filter')),
-            $this->getConnection()
-        );
-        $this->object_type = 'object';
-        $this->assign_filter = null;
-
-        foreach ($hosts as $hostname) {
-            $this->host = $hostname;
-            $str .= $this->toLegacyConfigString();
-        }
-
-        return $str;
-    }
-
     public function toConfigString()
     {
         if ($this->get('service_set_id')) {