From: Roland Häder Date: Sun, 5 Jul 2009 21:55:16 +0000 (+0000) Subject: Method initQueues() added, class name HubBootNode fixed X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c364d2db578eeaab4f077f281ac81aeb34c685f7;p=hub.git Method initQueues() added, class name HubBootNode fixed --- diff --git a/.gitattributes b/.gitattributes index 468e6ab41..91057f5bb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -34,7 +34,7 @@ application/hub/main/nodes/boot/class_HubBootNode.php -text application/hub/main/nodes/class_ -text application/hub/main/nodes/class_BaseHubNode.php -text application/hub/main/nodes/list/.htaccess -text -application/hub/main/nodes/list/class_BootListNode.php -text +application/hub/main/nodes/list/class_HubBootNode.php -text application/hub/main/nodes/master/.htaccess -text application/hub/main/nodes/master/class_HubMasterNode.php -text application/hub/main/nodes/regular/.htaccess -text diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 055d9c988..23ad957ac 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -192,10 +192,9 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica $nodeInstance->doBootstrapping(); // ----------------------- Init all query queues ---------------------- - // After the bootstrap is done we need to initialize the query queues - // which will help us to communicate between the "tasks" a hub needs to - // do. - $nodeInstance->initQueryQueues(); + // After the bootstrap is done we need to initialize the queues which + // will help us to communicate between the "tasks" a hub needs to do. + $nodeInstance->initQueues(); // ----------------------------- Main loop ---------------------------- // This is the main loop. Queried calls should come back here very fast diff --git a/application/hub/interfaces/nodes/class_NodeHelper.php b/application/hub/interfaces/nodes/class_NodeHelper.php index fb7513c2b..ac4705d17 100644 --- a/application/hub/interfaces/nodes/class_NodeHelper.php +++ b/application/hub/interfaces/nodes/class_NodeHelper.php @@ -31,6 +31,13 @@ interface NodeHelper extends FrameworkInterface { * @return void */ function doBootstrapping (); + + /** + * Initializes hub-specific queues + * + * @return void + */ + function initQueues (); } // diff --git a/application/hub/main/nodes/boot/class_HubBootNode.php b/application/hub/main/nodes/boot/class_HubBootNode.php index 32bb6366d..93befa342 100644 --- a/application/hub/main/nodes/boot/class_HubBootNode.php +++ b/application/hub/main/nodes/boot/class_HubBootNode.php @@ -95,7 +95,19 @@ class HubBootNode extends BaseHubNode implements NodeHelper { // This should be the last thing to do: output teaser lines $this->outputConsoleTeaser(); } + + /** + * Initializes hub-specific queues + * + * @return void + * @todo Unfinished method + */ + public function initQueues () { + // Call generic queues every hub may have, like the core queue + parent::initGenericQueues(); + $this->partialStub('Please add some more hub-specific queues.'); + } } -// [EOF] +// ?> diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index 319ae987a..b6ff400aa 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -200,6 +200,15 @@ class BaseHubNode extends BaseFrameworkSystem implements Updateable { } } + /** + * Initializes queues which every node needs + * + * @return void + */ + protected function initGenericQueues () { + $this->partialStub('Init query queue here.'); + } + /** * Adds hub data elements to a given dataset instance * diff --git a/application/hub/main/nodes/list/class_BootListNode.php b/application/hub/main/nodes/list/class_BootListNode.php deleted file mode 100644 index 2b5257fe7..000000000 --- a/application/hub/main/nodes/list/class_BootListNode.php +++ /dev/null @@ -1,78 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Hub 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 HubListNode extends BaseHubNode implements NodeHelper { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this hub-node class - * - * @param $requestInstance An instance of a Requestable class - * @return $nodeInstance An instance of this hub-node class - */ - public final static function createHubListNode (Requestable $requestInstance) { - // Get a new instance - $nodeInstance = new HubListNode(); - - // Set the request instance - $nodeInstance->setRequestInstance($requestInstance); - - // --------------------- Hub-id acquirement phase --------------------- - // Acquire a hub-id. This step generates on first launch a new one and - // on any later launches it will restore the hub-id from the database. - // A passed 'nickname=xxx' argument will be used to add some - // 'personality' to the hub. - $nodeInstance->acquireHubId(); - - // Return the instance - return $nodeInstance; - } - - /** - * Method to "bootstrap" the node. This step does also apply provided - * command-line arguments stored in the request instance. The regular node - * should communicate with the bootstrap-nodes at this point. - * - * @return void - * @todo Implement this method - */ - public function doBootstrapping () { - // Call generic (parent) bootstrapping method first - parent::doGenericBootstrapping(); - $this->partialStub('Please implement this method.'); - - // This should be the last line: output teaser - $this->outputConsoleTeaser(); - } -} - -// [EOF] -?> diff --git a/application/hub/main/nodes/list/class_HubBootNode.php b/application/hub/main/nodes/list/class_HubBootNode.php new file mode 100644 index 000000000..c490782db --- /dev/null +++ b/application/hub/main/nodes/list/class_HubBootNode.php @@ -0,0 +1,90 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Hub 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 HubListNode extends BaseHubNode implements NodeHelper { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this hub-node class + * + * @param $requestInstance An instance of a Requestable class + * @return $nodeInstance An instance of this hub-node class + */ + public final static function createHubListNode (Requestable $requestInstance) { + // Get a new instance + $nodeInstance = new HubListNode(); + + // Set the request instance + $nodeInstance->setRequestInstance($requestInstance); + + // --------------------- Hub-id acquirement phase --------------------- + // Acquire a hub-id. This step generates on first launch a new one and + // on any later launches it will restore the hub-id from the database. + // A passed 'nickname=xxx' argument will be used to add some + // 'personality' to the hub. + $nodeInstance->acquireHubId(); + + // Return the instance + return $nodeInstance; + } + + /** + * Method to "bootstrap" the node. This step does also apply provided + * command-line arguments stored in the request instance. The regular node + * should communicate with the bootstrap-nodes at this point. + * + * @return void + * @todo Implement this method + */ + public function doBootstrapping () { + // Call generic (parent) bootstrapping method first + parent::doGenericBootstrapping(); + $this->partialStub('Please implement this method.'); + + // This should be the last line: output teaser + $this->outputConsoleTeaser(); + } + + /** + * Initializes hub-specific queues + * + * @return void + * @todo Unfinished method + */ + public function initQueues () { + // Call generic queues every hub may have, like the core queue + parent::initGenericQueues(); + $this->partialStub('Please add some more hub-specific queues.'); + } +} + +// +?> diff --git a/application/hub/main/nodes/master/class_HubMasterNode.php b/application/hub/main/nodes/master/class_HubMasterNode.php index 5de2a59dd..983281756 100644 --- a/application/hub/main/nodes/master/class_HubMasterNode.php +++ b/application/hub/main/nodes/master/class_HubMasterNode.php @@ -72,7 +72,19 @@ class HubMasterNode extends BaseHubNode implements NodeHelper { // This should be the last line: output teaser $this->outputConsoleTeaser(); } + + /** + * Initializes hub-specific queues + * + * @return void + * @todo Unfinished method + */ + public function initQueues () { + // Call generic queues every hub may have, like the core queue + parent::initGenericQueues(); + $this->partialStub('Please add some more hub-specific queues.'); + } } -// [EOF] +// ?> diff --git a/application/hub/main/nodes/regular/class_HubRegularNode.php b/application/hub/main/nodes/regular/class_HubRegularNode.php index e1c144537..20ae415d4 100644 --- a/application/hub/main/nodes/regular/class_HubRegularNode.php +++ b/application/hub/main/nodes/regular/class_HubRegularNode.php @@ -73,7 +73,19 @@ class HubRegularNode extends BaseHubNode implements NodeHelper { // This is the last line: output teaser $this->outputConsoleTeaser(); } + + /** + * Initializes hub-specific queues + * + * @return void + * @todo Unfinished method + */ + public function initQueues () { + // Call generic queues every hub may have, like the core queue + parent::initGenericQueues(); + $this->partialStub('Please add some more hub-specific queues.'); + } } -// [EOF] +// ?>