This is a new idea to rewrite bootstrapping, the DHT will become an own task

diff --git a/application/hub/config.php b/application/hub/config.php
index 47f92d0a2b843976e8c45a6a094fd5a5727194eb..a4a0aed29f2acfd0f899048746c6f0e88fed3b53 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -171,9 +171,6 @@ $cfg->setConfigEntry('node_bootstrap_generate_sessionid_filter', 'NodeBootstrapG
 // CFG: NODE-BOOTSTRAP-GENERATE-PRIVATE-KEY-FILTER
 $cfg->setConfigEntry('node_bootstrap_generate_private_key_filter', 'NodeBootstrapGeneratePrivateKeyFilter');
 
-// CFG: NODE-BOOTSTRAP-RESTORE-NODELIST-FILTER
-$cfg->setConfigEntry('node_bootstrap_restore_nodelist_filter', 'NodeBootstrapRestoreNodeListFilter');
-
 // CFG: NODE-BOOTSTRAP-INIT-QUEUES-FILTER
 $cfg->setConfigEntry('node_bootstrap_init_queues_filter', 'NodeBootstrapInitQueuesFilter');
 

diff --git a/application/hub/interfaces/helper/nodes/class_NodeHelper.php b/application/hub/interfaces/helper/nodes/class_NodeHelper.php
index a7379ca7e015cd6e0f78b8daec7a38a973c5bcd4..4d04840a63113b889d11c8b7af41d5e956724841 100644 (file)
--- a/application/hub/interfaces/helper/nodes/class_NodeHelper.php
+++ b/application/hub/interfaces/helper/nodes/class_NodeHelper.php
@@ -96,13 +96,6 @@ interface NodeHelper extends Helper {
         */
        function initializeListenerPool ();
 
-       /**
-        * Restores a previously stored node list from database
-        *
-        * @return      void
-        */
-       function bootstrapRestoreNodeList ();
-
        /**
         * Announces this hub to the upper (bootstrap or list) hubs. After this is
         * successfully done the given task is unregistered from the handler.

diff --git a/application/hub/main/commands/console/class_HubConsoleMainCommand.php b/application/hub/main/commands/console/class_HubConsoleMainCommand.php
index e19773bc66cd36055333a449a44df63d5ff62b7e..036a38ca0287a78565b8b67c5934c7425a12b643 100644 (file)
--- a/application/hub/main/commands/console/class_HubConsoleMainCommand.php
+++ b/application/hub/main/commands/console/class_HubConsoleMainCommand.php
@@ -123,7 +123,6 @@ class HubConsoleMainCommand extends BaseCommand implements Commandable {
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_nodeid_filter'));
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_sessionid_filter'));
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_generate_private_key_filter'));
-               $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_restore_nodelist_filter'));
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_init_queues_filter'));
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_extra_bootstrapping_filter'));
                $controllerInstance->addBootstrapFilter(ObjectFactory::createObjectByConfiguredName('node_bootstrap_listener_pool_filter'));

diff --git a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php
index 79ae01a6b4c27ceef71c39cf466e3a692a43bc3f..f551ef47b7591c74e7b59193e56a1fa6505a87ab 100644 (file)
--- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php
+++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php
@@ -1,66 +1,3 @@
 <?php
-/**
- * A RestoreNodeList filter for bootstrapping
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Node Developer Team
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class NodeBootstrapRestoreNodeListFilter extends BaseNodeFilter implements Filterable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this filter class
-        *
-        * @return      $filterInstance         An instance of this filter class
-        */
-       public static final function createNodeBootstrapRestoreNodeListFilter () {
-               // Get a new instance
-               $filterInstance = new NodeBootstrapRestoreNodeListFilter();
-
-               // Return the instance
-               return $filterInstance;
-       }
-
-       /**
-        * Executes the filter with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @throws      FilterChainException    If $nodeInstance is null (no NullPointerException here)
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Get node instance
-               $nodeInstance = Registry::getRegistry()->getInstance('node');
-
-               // Restore a previously downloaded bootstrap-node list.
-               $nodeInstance->bootstrapRestoreNodeList();
-       }
-}
-
-// [EOF]
+// @DEPRECATED
 ?>

diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index 3795850cabc5b05742845c7f832023d928e0919a..7700f68e150b20f0fcaaf0c2f101035500c5d7f1 100644 (file)
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -652,20 +652,6 @@ class BaseHubNode extends BaseHubSystem implements Updateable {
                self::createDebugInstance(__CLASS__)->debugOutput('HUB: Initialize listener: FINISHED.');
        }
 
-       /**
-        * Restores a previously stored node list from database
-        *
-        * @return      void
-        * @todo        Rewrite this to use DHT instead
-        */
-       public function bootstrapRestoreNodeList () {
-               // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Restore node list: START');
-
-               // Debug output
-               self::createDebugInstance(__CLASS__)->debugOutput('HUB: Restore node list: FINISHED.');
-       }
-
        /**
         * Getter for isActive attribute
         *