Icingadb: Return earlier if no results found

Author: sukhwinder33445

application/controllers/DataController.php

@@ -281,29 +281,31 @@ private function addIcingadbHostsToPoints()
         $this->icingadbUtils->applyRestrictions($hostQuery);
 
         $hostQuery = $hostQuery->execute();
-        if ($hostQuery->hasResult()) {
-            foreach ($hostQuery as $row) {
-                if (! preg_match($this->coordinatePattern, $row->vars['geolocation'])) {
-                    continue;
-                }
+        if (! $hostQuery->hasResult()) {
+            return;
+        }
+
+        foreach ($hostQuery as $row) {
+            if (! preg_match($this->coordinatePattern, $row->vars['geolocation'])) {
+                continue;
+            }
 
-                $hostname = $row->name;
-                if (! isset($this->points['hosts'][$hostname])) {
-                    $host = $this->populateObjectColumnsToArray($row);
-                    $host['host_problem']               = $row->state->is_problem ? 1 : 0;
-                    $host['coordinates']                = $row->vars['geolocation'];
-                    $host['icon']                       = $row->vars['map_icon'] ?? null;
-                    $host['coordinates'] = explode(",", $host['coordinates']);
+            $hostname = $row->name;
+            if (! isset($this->points['hosts'][$hostname])) {
+                $host = $this->populateObjectColumnsToArray($row);
+                $host['host_problem']               = $row->state->is_problem ? 1 : 0;
+                $host['coordinates']                = $row->vars['geolocation'];
+                $host['icon']                       = $row->vars['map_icon'] ?? null;
+                $host['coordinates'] = explode(",", $host['coordinates']);
 
-                    $host['services'] = [];
+                $host['services'] = [];
 
-                    $this->points['hosts'][$row->name] = $host;
-                }
+                $this->points['hosts'][$row->name] = $host;
+            }
 
-                if ($row->service->id !== null) {
-                    $service = $this->populateObjectColumnsToArray($row->service);
-                    $this->points['hosts'][$hostname]['services'][$row->service->display_name] = $service;
-                }
+            if ($row->service->id !== null) {
+                $service = $this->populateObjectColumnsToArray($row->service);
+                $this->points['hosts'][$hostname]['services'][$row->service->display_name] = $service;
             }
         }
 
@@ -357,24 +359,27 @@ private function addIcingadbServicesToPoints()
 
         $this->icingadbUtils->applyRestrictions($serviceQuery);
         $serviceQuery = $serviceQuery->execute();
-        if ($serviceQuery->hasResult()) {
-            foreach ($serviceQuery as $row) {
-                if (! preg_match($this->coordinatePattern, $row->vars['geolocation'])) {
-                    continue;
-                }
 
-                $identifier = $row->host->name . "!" . $row->name;
-                $host = $this->populateObjectColumnsToArray($row->host);
-                $host['coordinates'] = $row->vars['geolocation'];
-                $host['icon'] = $row->vars['map_icon'] ?? null;
-                $host['coordinates'] = explode(",", $host['coordinates']);
+        if (! $serviceQuery->hasResult()) {
+            return;
+        }
 
-                $service = $this->populateObjectColumnsToArray($row);
+        foreach ($serviceQuery as $row) {
+            if (! preg_match($this->coordinatePattern, $row->vars['geolocation'])) {
+                continue;
+            }
 
-                $host['services'][$row->display_name] = $service;
+            $identifier = $row->host->name . "!" . $row->name;
+            $host = $this->populateObjectColumnsToArray($row->host);
+            $host['coordinates'] = $row->vars['geolocation'];
+            $host['icon'] = $row->vars['map_icon'] ?? null;
+            $host['coordinates'] = explode(",", $host['coordinates']);
 
-                $this->points['services'][$identifier] = $host;
-            }
+            $service = $this->populateObjectColumnsToArray($row);
+
+            $host['services'][$row->display_name] = $service;
+
+            $this->points['services'][$identifier] = $host;
         }
     }