Continued:

[core.git] / framework / main / middleware / debug / class_DebugMiddleware.php

diff --git a/framework/main/middleware/debug/class_DebugMiddleware.php b/framework/main/middleware/debug/class_DebugMiddleware.php
index eda4d5f9d47afc62c56da242453c917f2e8b9a58..53a2ece66208bb4d9bd4b7864d7fff75931fdd74 100644 (file)
--- a/framework/main/middleware/debug/class_DebugMiddleware.php
+++ b/framework/main/middleware/debug/class_DebugMiddleware.php
@@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Middleware\Debug;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
+use Org\Mxchange\CoreFramework\Logging\Logger;
 use Org\Mxchange\CoreFramework\Middleware\BaseMiddleware;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
@@ -38,7 +39,7 @@ use \InvalidArgumentException;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class DebugMiddleware extends BaseMiddleware implements Registerable {
+class DebugMiddleware extends BaseMiddleware implements Registerable, Logger {
        /**
         * An instance of this class
         */
@@ -122,16 +123,17 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         * @return      void
         * @throws      NullPointerException    If this->outputInstance is NULL
         */
-       private function outputMessage (string $message, bool $stripTags = false) {
+       private function outputMessage (string $logLevel, string $message, bool $stripTags = false) {
                // Get backtrace
-               //* NOISY-DEBUG: */ printf('[%s:%d]: message=%s,stripTags=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
+               //* NOISY-DEBUG: */ printf('[%s:%d]: logLevel=%s,message=%s,stripTags=%d - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $logLevel, $message, intval($stripTags));
                $backtrace = debug_backtrace(!DEBUG_BACKTRACE_PROVIDE_OBJECT);
 
                // Is the deprecated debugOutput() or partialStub() invoked before?
                if (isset($backtrace[4]) && $backtrace[3]['function'] == 'partialStub') {
                        // Prepend class::function:line from 2nd element
                        //* NOISY-DEBUG: */ printf('[%s:%d]: partialStub() was invoked ...' . PHP_EOL, __METHOD__, __LINE__);
-                       $message = sprintf('[%s::%s:%d]: %s',
+                       $message = sprintf('[%s] [%s::%s:%d]: %s',
+                               $logLevel,
                                $backtrace[4]['class'],
                                $backtrace[4]['function'],
                                (isset($backtrace[4]['line']) ? $backtrace[4]['line'] : '0'),
@@ -140,7 +142,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                } elseif (isset($backtrace[3]) && $backtrace[2]['function'] == 'debugOutput') {
                        // Prepend class::function:line from 2nd element
                        //* NOISY-DEBUG: */ printf('[%s:%d]: debugOutput() was invoked ...' . PHP_EOL, __METHOD__, __LINE__);
-                       $message = sprintf('[%s::%s:%d]: DEPRECATED: %s',
+                       $message = sprintf('[%s] [%s::%s:%d]: %s',
+                               $logLevel,
                                $backtrace[3]['class'],
                                $backtrace[3]['function'],
                                (isset($backtrace[3]['line']) ? $backtrace[3]['line'] : '0'),
@@ -149,7 +152,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                } else {
                        // Prepend class::function:line from 2nd element
                        //* NOISY-DEBUG: */ printf('[%s:%d]: Ordinary invocation ...' . PHP_EOL, __METHOD__, __LINE__);
-                       $message = sprintf('[%s::%s:%d]: %s',
+                       $message = sprintf('[%s] [%s::%s:%d]: %s',
+                               $logLevel,
                                $backtrace[2]['class'],
                                $backtrace[2]['function'],
                                (isset($backtrace[2]['line']) ? $backtrace[2]['line'] : '0'),
@@ -198,8 +202,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Use debug output handler
-               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
-               $this->outputMessage(sprintf('TRACE: %s', $message), $stripTags);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, Logger::LOGGER_LEVEL_TRACE, $message, intval($stripTags));
+               $this->outputMessage(Logger::LOGGER_LEVEL_TRACE, $message, $stripTags);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
@@ -230,8 +234,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Use debug output handler
-               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
-               $this->outputMessage(sprintf('DEBUG: %s', $message), $stripTags);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
+               $this->outputMessage(Logger::LOGGER_LEVEL_DEBUG, $message, $stripTags);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
@@ -262,8 +266,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Use debug output handler
-               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
-               $this->outputMessage(sprintf('INFO: %s', $message), $stripTags);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, Logger::LOGGER_LEVEL_INFO, $message, intval($stripTags));
+               $this->outputMessage(Logger::LOGGER_LEVEL_INFO, $message, $stripTags);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
@@ -294,8 +298,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Use debug output handler
-               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, $message, intval($stripTags));
-               $this->outputMessage(sprintf('WARNING: %s', $message), $stripTags);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s,%d) ...' . PHP_EOL, __METHOD__, __LINE__, Logger::LOGGER_LEVEL_WARNING, $message, intval($stripTags));
+               $this->outputMessage(Logger::LOGGER_LEVEL_WARNING, $message, $stripTags);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
@@ -319,7 +323,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Output stub message
-               $this->outputMessage($stubMessage);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s) ...' . PHP_EOL, __METHOD__, __LINE__, Logger::LOGGER_LEVEL_WARNING, $subMessage);
+               $this->outputMessage(Logger::LOGGER_LEVEL_WARNING, $stubMessage);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);
@@ -351,7 +356,8 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
                }
 
                // Invoke Inner method
-               $this->outputMessage(sprintf('DEPRECATED: %s', $message), $doPrint, $stripTags);
+               //* NOISY-DEBUG: */ printf('[%s:%d]: Invoking this->outputMessage(%s,%s) ...' . PHP_EOL, __METHOD__, __LINE__, Logger::LOGGER_LEVEL_DEPRECATED, $subMessage);
+               $this->outputMessage(Logger::LOGGER_LEVEL_DEPRECATED, $message, $doPrint, $stripTags);
 
                // Trace message
                //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__);