X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FLogger.php;h=6b8112796f557f00dea156a9c22fef3993097584;hb=f68b3c7c4ec9c7c98054035957db178d5071542c;hp=16fb13862823bb72281bf9e5476e839a861ab950;hpb=3282ce53894b624893ee2989747a59866ab4b137;p=friendica.git diff --git a/src/Core/Logger.php b/src/Core/Logger.php index 16fb138628..6b8112796f 100644 --- a/src/Core/Logger.php +++ b/src/Core/Logger.php @@ -5,8 +5,8 @@ namespace Friendica\Core; use Friendica\BaseObject; +use Friendica\Factory\LoggerFactory; use Friendica\Network\HTTPException\InternalServerErrorException; -use Friendica\Util\LoggerFactory; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; @@ -83,9 +83,7 @@ class Logger extends BaseObject return; } - if (is_int($loglevel)) { - $loglevel = self::mapLegacyConfigDebugLevel($loglevel); - } + $loglevel = self::mapLegacyConfigDebugLevel((string)$loglevel); LoggerFactory::addStreamHandler($logger, $logfile, $loglevel); @@ -107,7 +105,7 @@ class Logger extends BaseObject * Mapping a legacy level to the PSR-3 compliant levels * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel * - * @param int $level the level to be mapped + * @param string $level the level to be mapped * * @return string the PSR-3 compliant level */ @@ -115,26 +113,26 @@ class Logger extends BaseObject { switch ($level) { // legacy WARNING - case 0: + case "0": return LogLevel::ERROR; // legacy INFO - case 1: + case "1": return LogLevel::WARNING; // legacy TRACE - case 2: + case "2": return LogLevel::NOTICE; // legacy DEBUG - case 3: + case "3": return LogLevel::INFO; // legacy DATA - case 4: + case "4": return LogLevel::DEBUG; // legacy ALL - case 5: + case "5": return LogLevel::DEBUG; // default if nothing set default: - return LogLevel::NOTICE; + return $level; } } @@ -319,16 +317,16 @@ class Logger extends BaseObject self::getApp()->saveTimestamp($stamp1, 'file'); } - /** - * @brief Logs the given message at the given log level - * - * @param string $msg - * @param string $level + /** + * @brief Logs the given message at the given log level + * + * @param string $msg + * @param string $level * * @throws \Exception * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead - */ - public static function log($msg, $level = LogLevel::NOTICE) + */ + public static function log($msg, $level = LogLevel::INFO) { if (!isset(self::$logger)) { return;