From fa26f80244862bac5132dca85f046f1bfa391115 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 7 Jul 2009 19:56:56 +0000
Subject: [PATCH] Only TCP should be fine here

---
 application/hub/class_ApplicationHelper.php               | 2 ++
 application/hub/main/nodes/boot/class_HubBootNode.php     | 8 +-------
 application/hub/main/nodes/list/class_HubListNode.php     | 6 ------
 application/hub/main/nodes/master/class_HubMasterNode.php | 6 ------
 .../hub/main/nodes/regular/class_HubRegularNode.php       | 6 ------
 5 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 121f58f88..921f04d79 100644
--- 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 0311315c7..fa8c5064a 100644
--- 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 0e2fc9e9f..dc95272e1 100644
--- 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 92b100c74..96399a495 100644
--- 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 243271e6d..26d1456fb 100644
--- 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.');
 	}
 
 	/**
-- 
2.39.5