die() expanded with __METHOD__, wrong things removed from NodeMessageSelfConnectHandl...

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 1ce112e20f87d3223ae3c4a78bbfc809e72ba7d9..197a02d283b5791a9c1b2d566df6d9f94858ac86 100644 (file)
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -216,7 +216,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        public function handleFatalMessages (array $messageList) {
                // Walk through all messages
                foreach ($messageList as $message) {
-                       die('MSG:' . $message);
+                       die(__METHOD__ . ':MSG:' . $message);
                } // END - foreach
        }
 

diff --git a/application/hub/main/handler/chunks/class_ChunkHandler.php b/application/hub/main/handler/chunks/class_ChunkHandler.php
index 7aa6f23e37ec985b531ed7634b5e688f1c5e3667..033fa51afd5a0148683befcfc943740d249b6bef 100644 (file)
--- a/application/hub/main/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/main/handler/chunks/class_ChunkHandler.php
@@ -246,7 +246,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable
        private function preparePackageAssmble () {
                // Make sure both arrays have same count (this however should always be true)
                assert(count($this->finalPackageChunks['hashes']) == count($this->finalPackageChunks['content']));
-               //* DIE: */ die('finalPackageChunks='.print_r($this->finalPackageChunks['content'],true));
+               //* DIE: */ die(__METHOD__ . ':finalPackageChunks='.print_r($this->finalPackageChunks['content'],true));
 
                /*
                 * Remove last element (hash chunk) from 'hashes'. This hash will never

diff --git a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
index f14efd96ee01297987dba6789cb12f427c9b2e2b..a82c4f15dda80bb3631dce35fafdf58b773885ce 100644 (file)
--- a/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
+++ b/application/hub/main/handler/message-types/self-connect/class_NodeMessageSelfConnectHandler.php
@@ -62,11 +62,7 @@ class NodeMessageSelfConnectHandler extends BaseMessageHandler implements Handle
         * @return      void
         */
        public function handleMessageData (array $messageData, Receivable $packageInstance) {
-               // Register the announcing node with this node
-               $this->registerNodeByMessageData($messageData);
-
-               // Prepare answer message to be delivered back to the other node
-               $this->prepareAnswerMessage($messageData, $packageInstance);
+               die(__METHOD__ . ':messageData=' . $messageData);
        }
 
        /**

diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php
index b8ad315f506ee4a79dbad8f525a71b72300587ec..86695645194b674c86832df08a80c0e369d1d435 100644 (file)
--- a/application/hub/main/package/class_NetworkPackage.php
+++ b/application/hub/main/package/class_NetworkPackage.php
@@ -980,7 +980,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                 * @todo Unsupported feature of "signed" messages commented out
                if (!$this->isPackageSignatureValid($decodedArray)) {
                        // Is not valid, so throw an exception here
-                       die('INVALID SIG! UNDER CONSTRUCTION!' . chr(10));
+                       die(__METHOD__ . ':INVALID SIG! UNDER CONSTRUCTION!' . chr(10));
                } // END - if
                */
 
@@ -1110,7 +1110,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                // Handle message data
                $handlerInstance->handleMessageData($messageArray[self::MESSAGE_ARRAY_DATA], $this);
 
-               die('messageArray='.print_r($messageArray,true));
+               die(__METHOD__ . ':messageArray='.print_r($messageArray,true));
        }
 }