From b642128b172a507175165792400aabc9f9a3e795 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 31 Jan 2013 15:50:48 +0000 Subject: [PATCH] This is a new idea to rewrite bootstrapping, the DHT will become an own task --- application/hub/config.php | 3 - .../helper/nodes/class_NodeHelper.php | 7 -- .../console/class_HubConsoleMainCommand.php | 1 - ...ass_NodeBootstrapRestoreNodeListFilter.php | 65 +------------------ .../hub/main/nodes/class_BaseHubNode.php | 14 ---- 5 files changed, 1 insertion(+), 89 deletions(-) diff --git a/application/hub/config.php b/application/hub/config.php index 47f92d0a2..a4a0aed29 100644 --- 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 a7379ca7e..4d04840a6 100644 --- 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 e19773bc6..036a38ca0 100644 --- 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 79ae01a6b..f551ef47b 100644 --- a/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php +++ b/application/hub/main/filter/bootstrap/node/class_NodeBootstrapRestoreNodeListFilter.php @@ -1,66 +1,3 @@ - * @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 . - */ -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 3795850ca..7700f68e1 100644 --- 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 * -- 2.39.2