From be43014e0c4626f2148ec227eac4375fc28f5b18 Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Fri, 7 Mar 2014 16:08:54 +0100 Subject: [PATCH] Don't raise error if 'modules/monitoring/instances.ini' is missing --- .../application/controllers/ConfigController.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/controllers/ConfigController.php b/modules/monitoring/application/controllers/ConfigController.php index c75a54829..71498e832 100644 --- a/modules/monitoring/application/controllers/ConfigController.php +++ b/modules/monitoring/application/controllers/ConfigController.php @@ -71,8 +71,18 @@ class Monitoring_ConfigController extends BaseConfigController { public function indexAction() { $this->view->messageBox = new AlertMessageBox(true); - $this->view->backends = IcingaConfig::module('monitoring', 'backends')->toArray(); - $this->view->instances = IcingaConfig::module('monitoring', 'instances')->toArray(); + $monitoring_backends = IcingaConfig::module('monitoring', 'backends'); + $monitoring_instances = IcingaConfig::module('monitoring', 'instances'); + if ($monitoring_backends === null) { + $this->view->backends = array(); + } else { + $this->view->backends = $monitoring_backends->toArray(); + } + if ($monitoring_instances === null) { + $this->view->instances = array(); + } else { + $this->view->instances = $monitoring_instances->toArray(); + } $this->render('index'); }