From 60309dbf11b95facb4f49572f00d1937938b2bbb Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 12 Sep 2015 08:07:53 +0200 Subject: [PATCH] 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 --- .../node/connection/class_NodeSelfConnectHelper.php | 2 +- application/hub/classes/nodes/class_BaseHubNode.php | 9 +++++++++ application/hub/classes/tags/class_ | 2 +- .../tags/{class_BaseTags.php => class_BaseTag.php} | 2 +- .../hub/classes/tags/package/class_PackageTags.php | 2 +- application/hub/config.php | 3 +++ core | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) rename application/hub/classes/tags/{class_BaseTags.php => class_BaseTag.php} (96%) 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_BaseTags.php b/application/hub/classes/tags/class_BaseTag.php similarity index 96% rename from application/hub/classes/tags/class_BaseTags.php rename to application/hub/classes/tags/class_BaseTag.php index da61999b3..8525941b5 100644 --- a/application/hub/classes/tags/class_BaseTags.php +++ b/application/hub/classes/tags/class_BaseTag.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 BaseTags extends BaseHubSystem implements Registerable { +class BaseTag extends BaseHubSystem implements Registerable { /** * Constants for tags */ 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 -- 2.39.5