Use createDebugInstance() instead of direct debugOutput() method, removed DHT instanc...

diff --git a/application/hub/main/handler/message-types/class_BaseMessageHandler.php b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
index 5518e2e2cce5a283c0d98b527e15bc6e00378a7a..2063fc48e39379d7a9763c3ddebf3bc16f75f295 100644 (file)
--- a/application/hub/main/handler/message-types/class_BaseMessageHandler.php
+++ b/application/hub/main/handler/message-types/class_BaseMessageHandler.php
@@ -68,7 +68,7 @@ abstract class BaseMessageHandler extends BaseDataHandler {
        protected function registerNodeByMessageData (array $messageData) {
                // Check if searchData has entries
                assert(count($this->searchData) > 0);
-               $this->debugOutput('messageData=' . print_r($messageData, true));
+               self::createDebugInstance(__CLASS__)->debugOutput('messageData=' . print_r($messageData, true));
 
                // Get a wrapper instance
                $wrapperInstance = ObjectFactory::createObjectByConfiguredName('node_list_db_wrapper_class');
@@ -79,7 +79,7 @@ abstract class BaseMessageHandler extends BaseDataHandler {
                // Search for the node's session id and external IP/hostname + TCP port
                foreach ($this->searchData as $key) {
                        // Debug message
-                       //* DEBUG: */ $this->debugOutput('MESSAGE-HANDLER: messageData=' . print_r($messageData,true));
+                       //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('MESSAGE-HANDLER: messageData=' . print_r($messageData,true));
 
                        // Add criteria
                        $searchInstance->addCriteria('node_' . str_replace('my-', '', $key), $messageData[$key]);

diff --git a/application/hub/main/helper/hub/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php b/application/hub/main/helper/hub/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php
index 81789e414d7338624c82ebfcafc6df9cfee36feb..6926ed28f07a8b2154419913c69703182d2b46d4 100644 (file)
--- a/application/hub/main/helper/hub/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php
+++ b/application/hub/main/helper/hub/answer/requests/class_NodeRequestNodeListMessageAnswerHelper.php
@@ -81,9 +81,6 @@ class NodeRequestNodeListMessageAnswerHelper extends BaseHubAnswerHelper impleme
                // Is must not be NULL (then it can only be a template instance)
                assert(!is_null($entriesInstance));
 
-               // Get DHT instance
-               $dhtInstance = DhtObjectFactory::createDhtObjectInstance($nodeInstance);
-
                // Render the XML content
                $templateInstance->renderXmlContent();
        }

diff --git a/application/hub/main/package/assembler/class_PackageAssembler.php b/application/hub/main/package/assembler/class_PackageAssembler.php
index abf8cccb5370c3e87b82f99ef23ed40e5ab308c3..866bc2ea0777b2112853a627d53121e42f2368cf 100644 (file)
--- a/application/hub/main/package/assembler/class_PackageAssembler.php
+++ b/application/hub/main/package/assembler/class_PackageAssembler.php
@@ -176,7 +176,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable
         */
        public function handlePendingData () {
                // Debug output
-               //* NOISY-DEBUG: */ $this->debugOutput('PACKAGE-ASSEMBLER: Going to decode ' . strlen($this->pendingData) . ' Bytes of pending data. pendingData=' . $this->pendingData);
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('PACKAGE-ASSEMBLER: Going to decode ' . strlen($this->pendingData) . ' Bytes of pending data. pendingData=' . $this->pendingData);
 
                // Assert on condition
                assert(!$this->isPendingDataEmpty());

diff --git a/application/hub/main/streams/raw_data/input/class_RawDataInputStream.php b/application/hub/main/streams/raw_data/input/class_RawDataInputStream.php
index 41a4d474a8352f1d78861cdd88450db646e5c3e6..44a1999d23bafc48b535d6a9203780688cbf707b 100644 (file)
--- a/application/hub/main/streams/raw_data/input/class_RawDataInputStream.php
+++ b/application/hub/main/streams/raw_data/input/class_RawDataInputStream.php
@@ -79,7 +79,7 @@ class RawDataInputStream extends BaseStream implements InputStreamable {
                }
 
                // Debug message
-               //* NOISY-DEBUG: */ $this->debugOutput('RAW-INPUT-STREAM: Length of data is now ' . strlen($data) . ' Bytes.');
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('RAW-INPUT-STREAM: Length of data is now ' . strlen($data) . ' Bytes.');
 
                // Return it
                return $data;