tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IcingaService(Legacy): Fix duplicated rendering of apply 

refs #13049
This commit is contained in:
Markus Frosch 2016-11-15 10:52:03 +01:00
parent b40cfd5f05
commit 4e5dfb097e
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/Director/Objects/IcingaService.php
View File

@ -194,9 +194,11 @@ class IcingaService extends IcingaObject
{
$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 @@ class IcingaService extends IcingaObject
$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 @@ class IcingaService extends IcingaObject
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 @@ class IcingaService extends IcingaObject
}
}
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')) {