From e72a298bbe09dff03866d55d076d8afa6efc4fb7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 17 May 2012 19:08:21 +0000 Subject: [PATCH] die() expanded with __METHOD__, wrong things removed from NodeMessageSelfConnectHandler's method --- application/hub/class_ApplicationHelper.php | 2 +- application/hub/main/handler/chunks/class_ChunkHandler.php | 2 +- .../self-connect/class_NodeMessageSelfConnectHandler.php | 6 +----- application/hub/main/package/class_NetworkPackage.php | 4 ++-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 1ce112e20..197a02d28 100644 --- 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 7aa6f23e3..033fa51af 100644 --- 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 f14efd96e..a82c4f15d 100644 --- 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 b8ad315f5..866956451 100644 --- 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)); } } -- 2.39.2