diff --git a/src/LogLib/Classes/Utilities.php b/src/LogLib/Classes/Utilities.php index 2ebf9fa..af7bf24 100644 --- a/src/LogLib/Classes/Utilities.php +++ b/src/LogLib/Classes/Utilities.php @@ -157,7 +157,7 @@ * If $ansi is true, the output will be colored using ANSI escape codes. * If the event has no backtrace, the constant CallType::LAMBDA_CALL will be returned. */ - public static function getTraceString(Event $event): ?string + public static function getTraceString(Event $event, bool $ansi=true): ?string { if($event->getBacktrace() === null || count($event->getBacktrace()) === 0) { @@ -171,7 +171,12 @@ { if(isset($backtrace['file'])) { - return "\033[1;37m" . basename($backtrace['file']) . "\033[0m"; + if($ansi) + { + return "\033[1;37m" . basename($backtrace['file']) . "\033[0m"; + } + + return basename($backtrace['file']); } return basename($backtrace['file']); @@ -181,7 +186,12 @@ { if(isset($backtrace['file'])) { - return "\033[1;37m" . basename($backtrace['file']) . "\033[0m" . CallType::STATIC_CALL->value . CallType::LAMBDA_CALL->value; + if($ansi) + { + return "\033[1;37m" . basename($backtrace['file']) . "\033[0m" . CallType::STATIC_CALL->value . CallType::LAMBDA_CALL->value; + } + + return basename($backtrace['file']) . CallType::STATIC_CALL->value . CallType::LAMBDA_CALL->value; } return basename($backtrace['file']) . CallType::STATIC_CALL->value . CallType::LAMBDA_CALL->value; @@ -191,7 +201,12 @@ { if(isset($backtrace['file'])) { - return "\033[1;37m" . basename($backtrace['file']) . "\033[0m" . CallType::STATIC_CALL->value . CallType::EVAL_CALL->value; + if($ansi) + { + return "\033[1;37m" . basename($backtrace['file']) . "\033[0m" . CallType::STATIC_CALL->value . CallType::EVAL_CALL->value; + } + + return basename($backtrace['file']) . CallType::STATIC_CALL->value . CallType::EVAL_CALL->value; } return basename($backtrace['file']) . CallType::STATIC_CALL->value . CallType::EVAL_CALL->value; @@ -202,7 +217,14 @@ if(isset($backtrace["class"])) { - $class = sprintf("\033[1;37m%s\033[0m", $backtrace['class']); + if($ansi) + { + $class = sprintf("\033[1;37m%s\033[0m", $backtrace['class']); + } + else + { + $class = $backtrace['class']; + } } if($class === null) diff --git a/src/LogLib/Handlers/FileLogging.php b/src/LogLib/Handlers/FileLogging.php index ae451a7..95eaf27 100644 --- a/src/LogLib/Handlers/FileLogging.php +++ b/src/LogLib/Handlers/FileLogging.php @@ -28,7 +28,7 @@ class FileLogging implements LogHandlerInterface if(Validate::checkLevelType(LogLevel::DEBUG, $application->getConsoleLoggingLevel())) { - $backtrace_output = Utilities::getTraceString($event); + $backtrace_output = Utilities::getTraceString($event, false); $output = sprintf("[%s] [%s] [%s] %s %s" . PHP_EOL, self::getTimestamp(), $application->getApplicationName(), $event->getLevel()->name, $backtrace_output, $event->getMessage() @@ -41,9 +41,9 @@ class FileLogging implements LogHandlerInterface } else if(Validate::checkLevelType(LogLevel::VERBOSE, $application->getConsoleLoggingLevel())) { - $backtrace_output = Utilities::getTraceString($event); + $backtrace_output = Utilities::getTraceString($event, false); - $output = sprintf("[%s] [%s] %s %s" . PHP_EOL, $application->getApplicationName(), $event->getLevel()->name, $backtrace_output, $event->getMessage()); + $output = sprintf("[%s] [%s] [%s] %s %s" . PHP_EOL, self::getTimestamp(), $application->getApplicationName(), $event->getLevel()->name, $backtrace_output, $event->getMessage()); if($event->getException() !== null) { @@ -52,7 +52,7 @@ class FileLogging implements LogHandlerInterface } else { - $output = sprintf("[%s] [%s] %s" . PHP_EOL, $application->getApplicationName(), $event->getLevel()->name, $event->getMessage()); + $output = sprintf("[%s] [%s] [%s] %s" . PHP_EOL, self::getTimestamp(), $application->getApplicationName(), $event->getLevel()->name, $event->getMessage()); } self::getLogger($application)->append($output);