From a681d7e393f3d5c93e16b931c0376782a2332137 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 7 Feb 2019 12:04:55 +0100
Subject: [PATCH] Fix that imported nodes have no state, once and for all

---
 library/Businessprocess/BpConfig.php          | 61 ++++++++++---------
 .../Businessprocess/State/MonitoringState.php | 14 +++--
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/library/Businessprocess/BpConfig.php b/library/Businessprocess/BpConfig.php
index 3a41eba..7295508 100644
--- a/library/Businessprocess/BpConfig.php
+++ b/library/Businessprocess/BpConfig.php
@@ -89,10 +89,17 @@ class BpConfig
      */
     protected $root_nodes = array();
 
+    /**
+     * Imported nodes
+     *
+     * @var ImportedNode[]
+     */
+    protected $importedNodes = [];
+
     /**
      * Imported configs
      *
-     * @var array
+     * @var BpConfig[]
      */
     protected $importedConfigs = [];
 
@@ -437,21 +444,10 @@ class BpConfig
         return $this->nodes;
     }
 
-    public function hasNode($name, &$usedConfigs = null)
+    public function hasNode($name)
     {
         if (array_key_exists($name, $this->nodes)) {
             return true;
-        } elseif (! empty($this->importedConfigs)) {
-            $usedConfigs[$this->getName()] = true;
-            foreach ($this->importedConfigs as $config) {
-                if (isset($usedConfigs[$config->getName()])) {
-                    continue;
-                }
-
-                if ($config->hasNode($name, $usedConfigs)) {
-                    return true;
-                }
-            }
         }
 
         return false;
@@ -506,14 +502,14 @@ class BpConfig
     public function listInvolvedHostNames(&$usedConfigs = null)
     {
         $hosts = $this->hosts;
-        if (! empty($this->importedConfigs)) {
+        if (! empty($this->importedNodes)) {
             $usedConfigs[$this->getName()] = true;
-            foreach ($this->importedConfigs as $config) {
-                if (isset($usedConfigs[$config->getName()])) {
+            foreach ($this->importedNodes as $node) {
+                if (isset($usedConfigs[$node->getConfigName()])) {
                     continue;
                 }
 
-                $hosts += array_flip($config->listInvolvedHostNames($usedConfigs));
+                $hosts += array_flip($node->getBpConfig()->listInvolvedHostNames($usedConfigs));
             }
         }
 
@@ -564,6 +560,7 @@ class BpConfig
         }
 
         $node = new ImportedNode($this, $params);
+        $this->importedNodes[$node->getName()] = $node;
         $this->nodes[$node->getName()] = $node;
         return $node;
     }
@@ -585,6 +582,22 @@ class BpConfig
         return $this->importedConfigs[$name];
     }
 
+    public function listInvolvedConfigs(&$usedConfigs = null)
+    {
+        $configs = [];
+        foreach ($this->importedNodes as $node) {
+            $config = $node->getBpConfig();
+            $configs[] = $config;
+
+            if (! isset($usedConfigs[$node->getConfigName()])) {
+                $usedConfigs[$config->getName()] = true;
+                $configs = array_merge($configs, $config->listInvolvedConfigs($usedConfigs));
+            }
+        }
+
+        return $configs;
+    }
+
     /**
      * @return LegacyStorage
      */
@@ -601,11 +614,10 @@ class BpConfig
 
     /**
      * @param   string  $name
-     * @param   array   $usedConfigs
      * @return  Node
      * @throws  Exception
      */
-    public function getNode($name, &$usedConfigs = null)
+    public function getNode($name)
     {
         if ($name === '__unbound__') {
             return $this->getUnboundBaseNode();
@@ -613,17 +625,6 @@ class BpConfig
 
         if (array_key_exists($name, $this->nodes)) {
             return $this->nodes[$name];
-        } elseif (! empty($this->importedConfigs)) {
-            $usedConfigs[$this->getName()] = true;
-            foreach ($this->importedConfigs as $config) {
-                if (isset($usedConfigs[$config->getName()])) {
-                    continue;
-                }
-
-                if ($config->hasNode($name, $usedConfigs)) {
-                    return $config->getNode($name, $usedConfigs);
-                }
-            }
         }
 
         // Fallback: if it is a service, create an empty one:
diff --git a/library/Businessprocess/State/MonitoringState.php b/library/Businessprocess/State/MonitoringState.php
index 3f25465..1e48f65 100644
--- a/library/Businessprocess/State/MonitoringState.php
+++ b/library/Businessprocess/State/MonitoringState.php
@@ -93,13 +93,17 @@ class MonitoringState
 
         Benchmark::measure('Retrieved states for ' . count($serviceStatus) . ' services in ' . $config->getName());
 
-        foreach ($serviceStatus as $row) {
-            $this->handleDbRow($row, $config);
+        $configs = $config->listInvolvedConfigs();
+        $configs[] = $config;
+        foreach ($configs as $cfg) {
+            foreach ($serviceStatus as $row) {
+                $this->handleDbRow($row, $cfg);
+            }
+            foreach ($hostStatus as $row) {
+                $this->handleDbRow($row, $cfg);
+            }
         }
 
-        foreach ($hostStatus as $row) {
-            $this->handleDbRow($row, $config);
-        }
         // TODO: Union, single query?
         Benchmark::measure('Got states for business process ' . $config->getName());