From: Roland Haeder Date: Sat, 12 Sep 2015 06:07:53 +0000 (+0200) Subject: Renamed class BaseTags to BaseTag + added file-bases socket listener (may X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=60309dbf11b95facb4f49572f00d1937938b2bbb;p=hub.git Renamed class BaseTags to BaseTag + added file-bases socket listener (may produce a lot output). This listener will later serve as the communicator socket to attached applications. Signed-off-by: Roland Haeder --- diff --git a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php index 45fa460ba..ed9d5cb1c 100644 --- a/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php +++ b/application/hub/classes/helper/node/connection/class_NodeSelfConnectHelper.php @@ -36,7 +36,7 @@ class NodeSelfConnectHelper extends BaseNodeHelper implements HelpableNode { $this->setRecipientType(NetworkPackage::NETWORK_TARGET_SELF); // Set package tags - $this->setPackageTags(array(BaseTags::TAG_SELF_CONNECT)); + $this->setPackageTags(array(BaseTag::TAG_SELF_CONNECT)); } /** diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php index 0979c889b..2d6116746 100644 --- a/application/hub/classes/nodes/class_BaseHubNode.php +++ b/application/hub/classes/nodes/class_BaseHubNode.php @@ -531,6 +531,15 @@ class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria { // Get a new pool instance $this->setListenerPoolInstance(ObjectFactory::createObjectByConfiguredName('listener_pool_class', array($this))); + // Get an instance of the low-level listener + $listenerInstance = ObjectFactory::createObjectByConfiguredName('socket_file_listener_class'); + + // Initialize the listener + $listenerInstance->initListener(); + + // Add this listener to the pool + $this->getListenerPoolInstance()->addListener($listenerInstance); + // Get an instance of the low-level listener $listenerInstance = ObjectFactory::createObjectByConfiguredName('tcp_listener_class'); diff --git a/application/hub/classes/tags/class_ b/application/hub/classes/tags/class_ index 919141fab..0382a535b 100644 --- a/application/hub/classes/tags/class_ +++ b/application/hub/classes/tags/class_ @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ???Tags extends BaseTags implements Tagable { +class ???Tags extends BaseTag implements Tagable { /** * Protected constructor * diff --git a/application/hub/classes/tags/class_BaseTag.php b/application/hub/classes/tags/class_BaseTag.php new file mode 100644 index 000000000..8525941b5 --- /dev/null +++ b/application/hub/classes/tags/class_BaseTag.php @@ -0,0 +1,68 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.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 BaseTag extends BaseHubSystem implements Registerable { + /** + * Constants for tags + */ + const TAG_SELF_CONNECT = 'self_connect'; + const TAG_CLAIM_MINING_REWARD = 'claim_reward'; + + /** + * An array with all tags + */ + private $tags = array(); + + /** + * Protected constructor + * + * @param $className Name of the class + * @return void + */ + protected function __construct ($className) { + // Call parent constructor + parent::__construct($className); + } + + /** + * Setter for whole tags array + * + * @param $tags A new simple array with tags + * @return void + */ + protected final function setTags (array $tags) { + $this->tags = $tags; + } + + /** + * Getter for whole tags array + * + * @return $tags A new simple array with tags + */ + protected final function getTags () { + return $this->tags; + } +} + +// [EOF] +?> diff --git a/application/hub/classes/tags/class_BaseTags.php b/application/hub/classes/tags/class_BaseTags.php deleted file mode 100644 index da61999b3..000000000 --- a/application/hub/classes/tags/class_BaseTags.php +++ /dev/null @@ -1,68 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.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 BaseTags extends BaseHubSystem implements Registerable { - /** - * Constants for tags - */ - const TAG_SELF_CONNECT = 'self_connect'; - const TAG_CLAIM_MINING_REWARD = 'claim_reward'; - - /** - * An array with all tags - */ - private $tags = array(); - - /** - * Protected constructor - * - * @param $className Name of the class - * @return void - */ - protected function __construct ($className) { - // Call parent constructor - parent::__construct($className); - } - - /** - * Setter for whole tags array - * - * @param $tags A new simple array with tags - * @return void - */ - protected final function setTags (array $tags) { - $this->tags = $tags; - } - - /** - * Getter for whole tags array - * - * @return $tags A new simple array with tags - */ - protected final function getTags () { - return $this->tags; - } -} - -// [EOF] -?> diff --git a/application/hub/classes/tags/package/class_PackageTags.php b/application/hub/classes/tags/package/class_PackageTags.php index b2985f766..1d74bd7f9 100644 --- a/application/hub/classes/tags/package/class_PackageTags.php +++ b/application/hub/classes/tags/package/class_PackageTags.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class PackageTags extends BaseTags implements Tagable { +class PackageTags extends BaseTag implements Tagable { // Exception codes const EXCEPTION_INVALID_TAG = 0x160; diff --git a/application/hub/config.php b/application/hub/config.php index 027b48348..4f27e854f 100644 --- a/application/hub/config.php +++ b/application/hub/config.php @@ -69,6 +69,9 @@ $cfg->setConfigEntry('tcp_listener_class', 'TcpListener'); // CFG: UDP-LISTENER-CLASS $cfg->setConfigEntry('udp_listener_class', 'UdpListener'); +// CFG: SOCKET-FILE-LISTENER-CLASS +$cfg->setConfigEntry('socket_file_listener_class', 'SocketFileListener'); + // CFG: NODE-TCP-LISTENER-CLASS $cfg->setConfigEntry('node_tcp_listener_class', 'HubTcpListenerDecorator'); diff --git a/core b/core index bc1160b89..5aad6a4af 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bc1160b89c811d6e36a90be9d2fd3c1e13e01543 +Subproject commit 5aad6a4af62531050475887f66910b835f287452