Add todo to the MonitoringWizard related to the livestatus backend type

The requirement should be added to the OR-set that has currently both ido requirement sets so that livestatus may the only choice again. refs #8254
Icinga · Mar 10, 2015 · f4446cb · f4446cb
1 parent 59f43a0
commit f4446cb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -138,6 +138,7 @@ public function getRequirements()
     {
         $set = new RequirementSet();
 
+        // TODO(8254): Add this to the $backendSet
         $set->add(new PhpModuleRequirement(array(
             'optional'      => true,
             'condition'     => 'Sockets',
@@ -148,7 +149,7 @@ public function getRequirements()
             )
         )));
 
-        $idoSet = new RequirementSet(false, RequirementSet::MODE_OR);
+        $backendSet = new RequirementSet(false, RequirementSet::MODE_OR);
         $mysqlSet = new RequirementSet(true);
         $mysqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
@@ -168,7 +169,7 @@ public function getRequirements()
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
             )
         )));
-        $idoSet->merge($mysqlSet);
+        $backendSet->merge($mysqlSet);
         $pgsqlSet = new RequirementSet(true);
         $pgsqlSet->add(new PhpModuleRequirement(array(
             'optional'      => true,
@@ -188,8 +189,8 @@ public function getRequirements()
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
             )
         )));
-        $idoSet->merge($pgsqlSet);
-        $set->merge($idoSet);
+        $backendSet->merge($pgsqlSet);
+        $set->merge($backendSet);
 
         return $set;
     }