From: Roland Häder Date: Thu, 17 May 2012 11:48:48 +0000 (+0000) Subject: Added *REQUIRED* call compileConfigInVariables(), added missing config entry 'node_id' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39c6d09a6794a279c01d53807991c64324c1d6b2;p=hub.git Added *REQUIRED* call compileConfigInVariables(), added missing config entry 'node_id' --- diff --git a/application/hub/config.php b/application/hub/config.php index b20499020..9a86fcda7 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -558,6 +558,9 @@ $cfg->setConfigEntry('udp_connect_retry_max', 5); // CFG: NODE-STATE-CHECKED-PACKAGE-CLASS $cfg->setConfigEntry('node_state_checked_package_class', 'NewConnectionNodeState'); +// CFG: NODE-ID +$cfg->setConfigEntry('node_id', ''); + // CFG: SESSION-ID $cfg->setConfigEntry('session_id', ''); diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index db4055a12..1ba56ca42 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -433,6 +433,9 @@ class BaseHubNode extends BaseHubSystem implements Updateable { // Load the descriptor (XML) file $helperInstance->loadDescriptorXml(); + // Compile all variables + $helperInstance->getTemplateInstance()->compileConfigInVariables(); + // And send the package away $helperInstance->sendPackage($this); diff --git a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php index 0908b9e7f..a80245dda 100644 --- a/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php +++ b/application/hub/main/template/connect/class_XmlSelfConnectTemplateEngine.php @@ -258,8 +258,10 @@ class XmlSelfConnectTemplateEngine extends BaseTemplateEngine implements Compile return false; } // END - if - // Assign the found characters to variable and use the last entry from - // stack as the name + /* + * Assign the found characters to variable and use the last entry from + * stack as the name + */ parent::assignVariable($this->getStackerInstance()->getNamed('self_connect'), $characters); }