More debug lines added

diff --git a/application/hub/init.php b/application/hub/init.php
index 7b899fd96845c8ec65d49230a933511bcc878750..944a222a73548503f549df04acd3e6d55b0d3cf5 100644 (file)
--- a/application/hub/init.php
+++ b/application/hub/init.php
@@ -36,17 +36,17 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Initialize output system
-require($cfg->readConfig('base_path') . "inc/output.php");
+require($cfg->readConfig('base_path') . 'inc/output.php');
 
 // Initialize file i/o system
-require($cfg->readConfig('base_path') . "inc/file_io.php");
+require($cfg->readConfig('base_path') . 'inc/file_io.php');
 
 // Include the language sub-system
-require($cfg->readConfig('base_path') . "inc/language.php");
+require($cfg->readConfig('base_path') . 'inc/language.php');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
-require($cfg->readConfig('base_path') . "inc/database.php");
+require($cfg->readConfig('base_path') . 'inc/database.php');
 
 // Get's our IP address
 $_SERVER['SERVER_ADDR'] = ConsoleTools::acquireSelfIPAddress();

diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php
index b984b5ce8eee78c19ed0899d7f311b5e697605fd..0311315c7f1af6b197618a478d1405a7354f2a53 100644 (file)
--- a/application/hub/main/nodes/boot/class_HubBootNode.php
+++ b/application/hub/main/nodes/boot/class_HubBootNode.php
@@ -65,25 +65,31 @@ class HubBootNode extends BaseHubNode implements NodeHelper {
                parent::doGenericBootstrapping();
 
                // Now check if the IP address matches one of the bootstrap nodes
-               if ($this->ifAddressMatchesBootstrappingNodes($_SERVER['REMOTE_ADDR'])) {
+               if ($this->ifAddressMatchesBootstrappingNodes($_SERVER['SERVER_ADDR'])) {
                        // Get our port from configuration
                        $ourPort = $this->getConfigInstance()->readConfig('node_listen_port');
 
                        // Is the port the same?
                        if (substr($this->bootIpPort, -strlen($ourPort), strlen($ourPort)) == $ourPort) {
                                // It is the same!
-                               $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: IP/port matches bootstrapping node ' . $this->bootIpPort . '.');
+                               $this->getDebugInstance()->output('BOOTSTRAP: IP/port matches bootstrapping node ' . $this->bootIpPort . '.');
 
                                // Now, does the mode match (should be 'boot'!)
                                if ($this->getRequestInstance()->getRequestElement('mode') == 'boot') {
                                        // Output debug message
-                                       $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: Our node is a valid bootstrapping node.');
+                                       $this->getDebugInstance()->output('BOOTSTRAP: Our node is a valid bootstrapping node.');
                                } else {
                                        // Output warning
-                                       $this->getDebugInstance()->output(__FUNCTION__.'['.__LINE__.']: WARNING! Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
+                                       $this->getDebugInstance()->output('BOOTSTRAP: WARNING: Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
                                }
-                       } // END - if
-               } // END - if
+                       } else {
+                               // IP does match, but no port
+                               $this->getDebugInstance()->output('BOOTSTRAP: WARNING: Our IP ' . $_SERVER['SERVER_ADDR'] . ' does match a known bootstrap-node but not the port ' . $ourPort . '.');
+                       }
+               } else {
+                       // Node does not match any know bootstrap-node
+                       $this->getDebugInstance()->output('BOOTSTRAP: WARNING: Our IP ' . $_SERVER['SERVER_ADDR'] . ' does not match any known bootstrap-nodes.');
+               }
 
                // This might not be all...
                $this->partialStub('Please implement more bootsrapping steps.');