Opps, introduced this for debugging ...

[core.git] / inc / classes / middleware / debug / class_DebugMiddleware.php

diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index 328281b6085a6d58e2cd1f7efba32f3706cb9b98..a275de113a3b9c01ecf3a74a1af2c983d729e341 100644 (file)
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -55,26 +55,45 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         * If no output is given this class is currently being used for back-fall.
         * This fall-back mechanism will become deprecated very soon.
         *
-        * @param       $debuggerClass  The class name which we shall use for
+        * @param       $outputClass    The class name which we shall use for
         *                                                      registering the *real* debug output
+        * @param       $className              Class where a output should be created and
+        *                                                      configured for
         * @return      $debugInstance  An instance of this middleware class
         */
-       public static final function createDebugMiddleware ($debuggerClass) {
+       public static final function createDebugMiddleware ($outputClass, $className) {
+               //* DEBUG-DIE: */ die(__METHOD__.': outputClass=' . $outputClass . ',className=' . $className);
+
                // Create an instance if this middleware
                $debugInstance = new DebugMiddleware();
 
+               // Default is that $outputClass may be invalid
+               $isInitialized = FALSE;
+
                // Is there a valid output instance provided?
-               if ((!is_null($debuggerClass)) && (is_object($debuggerClass)) && ($debuggerClass instanceof OutputStreamer)) {
+               if ((!is_null($outputClass)) && (is_object($outputClass)) && ($outputClass instanceof OutputStreamer)) {
                        // Use the given output instance
-                       $debugInstance->setOutputInstance($debuggerClass);
-               } elseif ((!is_null($debuggerClass)) && (is_string($debuggerClass)) && (class_exists($debuggerClass))) {
+                       $debugInstance->setOutputInstance($outputClass);
+
+                       // All fine
+                       $isInitialized = TRUE;
+               } elseif ((!is_null($outputClass)) && (is_string($outputClass)) && (class_exists($outputClass))) {
                        // A name for a debug output class has been provided so we try to get it
-                       $debuggerInstance = ObjectFactory::createObjectByName($debuggerClass);
+                       $outputInstance = ObjectFactory::createObjectByName($outputClass);
 
                        // Set this as output class
-                       $debugInstance->setOutputInstance($debuggerInstance);
+                       $debugInstance->setOutputInstance($outputInstance);
+
+                       // All fine
+                       $isInitialized = TRUE;
                }
 
+               // Is the output class initialized?
+               if ($isInitialized === TRUE) {
+                       // Then set class name
+                       $debugInstance->getOutputInstance()->setLoggerClassName($className);
+               } // END - if
+
                // Return instance
                return $debugInstance;
        }