Only TCP should be fine here

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 121f58f88a08d3024bb42d820567c23b0feebfa5..921f04d7991e0daa99be45ac51b8516c178b3f9c 100644 (file)
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -195,7 +195,9 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Try to bootstrap the node and pass the request instance to it for
                // extra arguments which mostly override config entries or enable special
                // features within the hub (none is ready at this development stage)
+               $this->getDebugInstance()->output('BOOTSTRAP: Beginning with bootstrap...');
                $nodeInstance->doBootstrapping();
+               $this->getDebugInstance()->output('BOOTSTRAP: Bootstrap finished.');
 
                // ----------------------- Init all query queues ----------------------
                // After the bootstrap is done we need to initialize the queues which

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index 0311315c7f1af6b197618a478d1405a7354f2a53..fa8c5064a2335d175527caa693b49bac3bfb7b12 100644 (file)
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -58,16 +58,13 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
         * @todo        add some more special bootstrap things for this boot node
         */
        public function doBootstrapping () {
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Beginning with bootstrap...');
-
                // Call generic (parent) bootstrapping method first
                parent::doGenericBootstrapping();
 
                // Now check if the IP address matches one of the bootstrap nodes
                if ($this->ifAddressMatchesBootstrappingNodes($_SERVER['SERVER_ADDR'])) {
                        // Get our port from configuration
-                       $ourPort = $this->getConfigInstance()->readConfig('node_listen_port');
+                       $ourPort = $this->getConfigInstance()->readConfig('node_tcp_listen_port');
 
                        // Is the port the same?
                        if (substr($this->bootIpPort, -strlen($ourPort), strlen($ourPort)) == $ourPort) {
@@ -93,9 +90,6 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
 
                // This might not be all...
                $this->partialStub('Please implement more bootsrapping steps.');
-
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Bootstrap finished.');
        }
 
        /**

diff --git a/application/hub/main/nodes/list/class_HubListNode.php b/application/hub/main/nodes/list/class_HubListNode.php
index 0e2fc9e9f066f35b6b39987b6070eecd98d29c7b..dc95272e19527a3ff8dedaa87243515a5d5a6cd7 100644 (file)
--- a/application/hub/main/nodes/list/class_HubListNode.php
+++ b/application/hub/main/nodes/list/class_HubListNode.php
@@ -58,15 +58,9 @@ class HubListNode extends BaseHubNode implements NodeHelper {
         * @todo        Implement this method
         */
        public function doBootstrapping () {
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Beginning with bootstrap...');
-
                // Call generic (parent) bootstrapping method first
                parent::doGenericBootstrapping();
                $this->partialStub('Please implement this method.');
-
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Bootstrap finished.');
        }
 
        /**

diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php
index 92b100c749900d5069b9fb201ed6412cca1b9b48..96399a495c455567c3ab54132ed6f53b8bbcea5a 100644 (file)
--- a/application/hub/main/nodes/master/class_HubMasterNode.php
+++ b/application/hub/main/nodes/master/class_HubMasterNode.php
@@ -58,15 +58,9 @@ class HubMasterNode extends BaseHubNode implements NodeHelper {
         * @todo        Implement this method
         */
        public function doBootstrapping () {
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Beginning with bootstrap...');
-
                // Call generic (parent) bootstrapping method first
                parent::doGenericBootstrapping();
                $this->partialStub('Please implement this method.');
-
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Bootstrap finished.');
        }
 
        /**

diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php
index 243271e6d717c1a33b14cff92abc437ec49f3c52..26d1456fb937ec94a800c2f6a787e8a22eaec79f 100644 (file)
--- a/application/hub/main/nodes/regular/class_HubRegularNode.php
+++ b/application/hub/main/nodes/regular/class_HubRegularNode.php
@@ -58,15 +58,9 @@ class HubRegularNode extends BaseHubNode implements NodeHelper {
         * @todo        Implement this method
         */
        public function doBootstrapping () {
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Beginning with bootstrap...');
-
                // Call generic (parent) bootstrapping method first
                parent::doGenericBootstrapping();
                $this->partialStub('Please implement this method.');
-
-               // Output message
-               $this->getDebugInstance()->output('BOOTSTRAP: Bootstrap finished.');
        }
 
        /**