Use $this->debugBackTrace() instead of die()

diff --git a/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php b/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php
index 97becaf7aa76ad9544d8f16eadeca04a047a782d..7a6282581be1c9f40ec7ac687e8f1010945df226 100644 (file)
--- a/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php
+++ b/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php
@@ -62,6 +62,25 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper implements Look
                return $wrapperInstance;
        }
 
+       /**
+        * "Getter" for a LocalSearchCriteria from given package data's sender
+        *
+        * @param       $packageData            Valid raw package data array
+        * @return      $searchInstance         An instance of a LocalSearchCriteria class
+        */
+       private function getSenderSearchInstanceFromPackageData (array $packageData) {
+               // Get the instance
+               //* NOISY-DEBUG: */ $this->debugOutput('DATABASE-WRAPPER: Searching for sender ' . $packageData[NetworkPackage::PACKAGE_DATA_SENDER]);
+               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
+
+               // Add 'sender' as the peer's IP address
+               $searchInstance->addCriteria(self::DB_COLUMN_PEER_SESSION_ID, $packageData[NetworkPackage::PACKAGE_DATA_SENDER]);
+               $searchInstance->setLimit(1);
+
+               // Return the instance
+               return $searchInstance;
+       }
+
        /**
         * Getter for index key
         *
@@ -88,16 +107,11 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper implements Look
                // Is the package valid?
                if (!isset($packageData[NetworkPackage::PACKAGE_DATA_SENDER])) {
                        // Invalid package found, please report this
-                       die(__METHOD__ . ': packageData=' . print_r($packageData, true));
+                       $this->debugBackTrace(__METHOD__ . ': packageData=' . print_r($packageData, true));
                } // END - if
 
-               // Get a search criteria instance
-               //* NOISY-DEBUG: */ $this->debugOutput('DATABASE-WRAPPER: Searching for sender ' . $packageData[NetworkPackage::PACKAGE_DATA_SENDER]);
-               $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
-
-               // Add 'sender' as the peer's IP address
-               $searchInstance->addCriteria(self::DB_COLUMN_PEER_SESSION_ID, $packageData[NetworkPackage::PACKAGE_DATA_SENDER]);
-               $searchInstance->setLimit(1);
+               // Get a search criteria instance from package data
+               $searchInstance = $this->getSenderSearchInstanceFromPackageData($packageData);
 
                // Is the dataset instance set?
                if ($dataSetInstance instanceof StoreableCriteria) {

diff --git a/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php b/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php
index bc9252401c5c64920214f04d195217a240601eef..fd5f9d3b0a42e5847284ce4c3b2dfb1835680449 100644 (file)
--- a/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php
+++ b/application/hub/main/filter/cruncher/class_CruncherInitializationFilter.php
@@ -85,7 +85,7 @@ class CruncherInitializationFilter extends BaseFilter implements Filterable {
                } catch (ClassNotFoundException $e) {
                        // This exception means, the cruncher mode is invalid.
                        // @TODO Can we rewrite this to app_die() ?
-                       die(__METHOD__ . ': cruncher mode ' . $cruncherMode . ' is invalid.' . "\n");
+                       $this->debugBackTrace(__METHOD__ . ': cruncher mode ' . $cruncherMode . ' is invalid.' . "\n");
                }
 
                // Set the cruncher instance in registry

diff --git a/application/hub/main/filter/node/class_NodeInitializationFilter.php b/application/hub/main/filter/node/class_NodeInitializationFilter.php
index bf0cc5cb2a73326c3b3b53ecbb4692908d7eb0d2..c5387feefdb08afb6c431f4e7260c3995415d08b 100644 (file)
--- a/application/hub/main/filter/node/class_NodeInitializationFilter.php
+++ b/application/hub/main/filter/node/class_NodeInitializationFilter.php
@@ -85,7 +85,7 @@ class NodeInitializationFilter extends BaseFilter implements Filterable {
                } catch (ClassNotFoundException $e) {
                        // This exception means, the node mode is invalid.
                        // @TODO Can we rewrite this to app_die() ?
-                       die(__METHOD__ . ': node mode ' . $nodeMode . ' is invalid.' . "\n");
+                       $this->debugBackTrace(__METHOD__ . ': node mode ' . $nodeMode . ' is invalid.' . "\n");
                }
 
                // Set the node instance in registry

diff --git a/application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php b/application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php
index db230642b6a66287cf7eac7a7e0cf1686b9b094b..9e6a800ca84f51ec20c0d096940c967a95161fe2 100644 (file)
--- a/application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php
+++ b/application/hub/main/helper/connection/udp/class_UdpConnectionHelper.php
@@ -43,7 +43,7 @@ class UdpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
         * @return      $socketResource         Socket resource
         */
        public static function createConnectionFromPackageData (array $packageData) {
-               die(__METHOD__ . ': Unfinished method, packageData[]=' . count($packageData) . "\n");
+               $this->debugBackTrace(__METHOD__ . ': Unfinished method, packageData[]=' . count($packageData) . "\n");
        }
 
        /**
@@ -51,7 +51,7 @@ class UdpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp
         *
         * @return      void
         * @throws      SocketShutdownException         If the current socket could not be shut down
-        * @todo        We may want to implement a filter for ease notification of other objects like our pool
+        * @todo        Implement a filter for ease notification of other objects like the pool
         */
        public function doShutdown () {
                $this->partialStub('Please implement this method.');

diff --git a/application/hub/main/pools/peer/class_DefaultPeerPool.php b/application/hub/main/pools/peer/class_DefaultPeerPool.php
index 42ca9668e7c105a6250f14137cd7191a1d1ad850..3158547f2df049efeec0a38322e3170f747e9ebe 100644 (file)
--- a/application/hub/main/pools/peer/class_DefaultPeerPool.php
+++ b/application/hub/main/pools/peer/class_DefaultPeerPool.php
@@ -147,7 +147,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer {
                        } // END - if
 
                        // @TODO Check for IP
-                       die(__METHOD__.':'.print_r($packageData, true));
+                       $this->debugBackTrace(__METHOD__ . ':'.print_r($packageData, true));
                } // END - foreach
 
                // Return the determined socket resource