tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Exporter: services should be an array

Browse Source
This commit is contained in:
Thomas Gelf 2023-03-07 11:20:07 +01:00
parent d6bec9bfe1
commit 21d913e232
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/Director/Data/Exporter.php
View File

@ -152,10 +152,10 @@ class Exporter
throw new RuntimeException('Not yet');
}
$props['services'] = [];
foreach ($object->getServiceObjects() as $serviceObject) {
$props['services'][$serviceObject->getObjectName()] = $this->export($serviceObject);
foreach ($object->getServices() as $serviceObject) {
$props['services'][] = $this->export($serviceObject);
}
ksort($props['services']);
usort($props['services'], [$this, 'sortByName']);
} elseif ($object instanceof IcingaHost) {
if ($this->exportHostServices) {
$services = [];
@ -168,6 +168,11 @@ class Exporter
}
}
protected function sortByName($left, $right)
{
return $left->object_name < $right->object_name ? '-1' : '1';
}
public function serviceLoader()
{
if ($this->serviceLoader === null) {