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

Sync: do not fail on non-IcingaObject, fix typo 

refs #832
This commit is contained in:
Thomas Gelf 2017-03-14 16:08:37 +01:00
parent b558cc405b
commit 0e759fb2f6
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Director/Import/Sync.php
View File

@ -83,7 +83,7 @@ class Sync
protected $columnFilters = array(); protected $columnFilters = array();
/** @var HostGroupMembershipResolver|bool */ /** @var HostGroupMembershipResolver|bool */
protected $hostGropMembershipResolver; protected $hostGroupMembershipResolver;
/** /**
* Constructor. No direct initialization allowed right now. Please use one * Constructor. No direct initialization allowed right now. Please use one
@ -496,9 +496,12 @@ class Sync
return $this; return $this;
} }
protected function setResolver(IcingaObject $object) protected function setResolver($object)
{ {
if ($resolver = $this->getHostGropMembershipResolver()) { if (! ($object instanceof IcingaObject)) {
return $this;
}
if ($resolver = $this->gethostGroupMembershipResolver()) {
/** @var IcingaHost|IcingaHostGroup $object */ /** @var IcingaHost|IcingaHostGroup $object */
$object->setHostGroupMembershipResolver($resolver); $object->setHostGroupMembershipResolver($resolver);
} }
@ -508,29 +511,29 @@ class Sync
protected function notifyResolvers() protected function notifyResolvers()
{ {
if ($resolver = $this->getHostGropMembershipResolver()) { if ($resolver = $this->gethostGroupMembershipResolver()) {
$resolver->defer(); $resolver->defer();
} }
return $this; return $this;
} }
protected function getHostGropMembershipResolver() protected function gethostGroupMembershipResolver()
{ {
if ($this->hostGropMembershipResolver === null) { if ($this->hostGroupMembershipResolver === null) {
if (in_array( if (in_array(
$this->rule->get('object_type'), $this->rule->get('object_type'),
array('host', 'hostgroup') array('host', 'hostgroup')
)) { )) {
$this->hostGropMembershipResolver = new HostGroupMembershipResolver( $this->hostGroupMembershipResolver = new HostGroupMembershipResolver(
$this->db $this->db
); );
} else { } else {
$this->hostGropMembershipResolver = false; $this->hostGroupMembershipResolver = false;
} }
} }
return $this->hostGropMembershipResolver; return $this->hostGroupMembershipResolver;
} }
/** /**