No, post-handling is the right one, not post-processing ...
authorRoland Haeder <roland@mxchange.org>
Sun, 24 May 2015 18:29:50 +0000 (20:29 +0200)
committerRoland Haeder <roland@mxchange.org>
Sun, 24 May 2015 18:29:50 +0000 (20:29 +0200)
Signed-off-by: Roland Haeder <roland@mxchange.org>
application/hub/config.php
application/hub/interfaces/handler/message-types/class_HandleableMessage.php
application/hub/main/factories/chain/class_PackageFilterChainFactory.php
application/hub/main/filter/package/.htaccess [deleted file]
application/hub/main/filter/package/class_PackageHashToMinerFilter.php [deleted file]
application/hub/main/handler/message-types/class_BaseMessageHandler.php
application/hub/main/package/class_NetworkPackage.php

index 67a51950604e1b1e462ca7e739a9db2b400e685c..c464598599b8fafedfb0b36ffab9e025f9871864 100644 (file)
@@ -204,9 +204,6 @@ $cfg->setConfigEntry('package_tag_request_node_list_answer_filter', 'PackageRequ
 // CFG: PACKAGE-TAG-DHT-BOOTSTRAP-FILTER
 $cfg->setConfigEntry('package_tag_dht_bootstrap_filter', 'PackageDhtBootstrapTagFilter');
 
-// CFG: PACKAGE-HASH-TO-MINER-FILTER
-$cfg->setConfigEntry('package_hash_to_miner_filter', 'PackageHashToMinerFilter');
-
 // CFG: MESSAGE-TYPE-ANNOUNCEMENT-HANDLER-CLASS
 $cfg->setConfigEntry('message_type_announcement_handler_class', 'NodeMessageAnnouncementHandler');
 
index befe36d102a73a015b8c9c1d693fdc693a189c31..2f762198572a017b6b254938da6d6794428e8987 100644 (file)
@@ -30,6 +30,15 @@ interface HandleableMessage extends HandleableDataSet {
         * @return      void
         */
        function handleMessageData (array $messageData, Receivable $packageInstance);
+
+       /**
+        * Posty-handles data array of the message
+        *
+        * @param       $messageData            An array with message data to handle
+        * @param       $packageInstance        An instance of a Receivable class
+        * @return      void
+        */
+       function postHandleMessageData (array $messageData, Receivable $packageInstance);
 }
 
 // [EOF]
index e07b77126a683eaf717e4eb62d583b55dce42feb..0a70fe2327db9b6b3f5541bf70b82f9f63440e5b 100644 (file)
@@ -64,9 +64,6 @@ class PackageFilterChainFactory extends ObjectFactory {
                                $chainInstance->addFilter($filterInstance);
                        } // END - foreach
 
-                       // Add filter for handling hash to miner queue
-                       $filterInstance = self::createObjectByConfiguredName('package_hash_to_miner_filter');
-
                        // Add this post-filter to the chain
                        $chainInstance->addPostFilter($filterInstance);
 
diff --git a/application/hub/main/filter/package/.htaccess b/application/hub/main/filter/package/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/application/hub/main/filter/package/class_PackageHashToMinerFilter.php b/application/hub/main/filter/package/class_PackageHashToMinerFilter.php
deleted file mode 100644 (file)
index 12e724f..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * A package filter for passing over a message hash and sender to the miner's
- * queue.
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @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.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 PackageHashToMinerFilter extends BaseHubFilter implements FilterablePackage {
-       /**
-        * 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 final static function createPackageHashToMinerFilter () {
-               // Get a new instance
-               $filterInstance = new PackageHashToMinerFilter();
-
-               // 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      UnsupportedOperationException   If this method is called, please use processMessage() instead!
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Please don't call this method
-               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-       }
-
-       /**
-        * Processes the given raw message content.
-        *
-        * @param       $messageData            Raw message data array
-        * @param       $packageInstance        An instance of a Receivable class
-        * @return      void
-        * @throws      UnsupportedOperationException   If this method is called, please use processMessage() instead!
-        */
-       public function processMessage (array $messageData, Receivable $packageInstance) {
-               // Please don't call this method
-               throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
-       }
-
-       /**
-        * Post-processes the given raw message content. The method renderXmlContent
-        * may throw (not the method itself) several exceptions:
-        *
-        * @param       $packageInstance        An instance of a Receivable class
-        * @return      void
-        */
-       public function postProcessMessage (Receivable $packageInstance) {
-               // Get current entry from stack
-               $messageData = $packageInstance->getStackInstance()->getNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE);
-
-               /*
-                * Feed hash to miner by handling over the whole array as also the
-                * sender and tags are needed.
-                */
-               $packageInstance->feedHashToMiner($messageData);
-       }
-}
-
-// [EOF]
-?>
index d04acc1f7dba70751cc835dccdffe90aca6d9415..2eff41a6b96311eb0e903f5bb8a27cb0dcdca385 100644 (file)
@@ -71,6 +71,24 @@ abstract class BaseMessageHandler extends BaseDataHandler {
                // Let the DHT facade do the work
                $this->getDhtInstance()->registerNodeByMessageData($messageData, $this);
        }
+
+       /**
+        * Posty-handles data array of the message
+        *
+        * @param       $messageData            An array with message data to handle
+        * @param       $packageInstance        An instance of a Receivable class
+        * @return      void
+        */
+       public function postHandleMessageData (array $messageData, Receivable $packageInstance) {
+               // Get current entry from stack
+               $messageData = $packageInstance->getStackInstance()->getNamed(NetworkPackage::STACKER_NAME_PROCESSED_MESSAGE);
+
+               /*
+                * Feed hash to miner by handling over the whole array as also the
+                * sender and tags are needed.
+                */
+               $packageInstance->feedHashToMiner($messageData);
+       }
 }
 
 // [EOF]
index 2dd319785a9bf3e85030c6f015bcccc810c771b9..804fb695e4ed8160f49121d0e9ae811eaeaab167 100644 (file)
@@ -1398,6 +1398,9 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
 
                // Handle message data
                $handlerInstance->handleMessageData($messageArray[self::MESSAGE_ARRAY_DATA], $this);
+
+               // Post-handling of message data
+               $handlerInstance->postHandleMessageData($messageArray, $this);
        }
 
        /**