X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FLogger.php;h=fc2dde1dfe703f3de75e6044cc7fccc8b699e7bd;hb=318a3ca785474fa27fbff9b3ee19fd4c04261ecd;hp=6102baa5a5cb2ab73f564596494deb83a36fa669;hpb=8f9c0fe14956efbcaf0db9dbfb83222e18e0ab2f;p=friendica.git diff --git a/src/Core/Logger.php b/src/Core/Logger.php index 6102baa5a5..fc2dde1dfe 100644 --- a/src/Core/Logger.php +++ b/src/Core/Logger.php @@ -4,47 +4,38 @@ */ namespace Friendica\Core; -use Friendica\BaseObject; -use Friendica\Network\HTTPException\InternalServerErrorException; -use Friendica\Util\LoggerFactory; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; /** * @brief Logger functions */ -class Logger extends BaseObject +class Logger { /** - * @deprecated 2019.03 use Logger::error() instead * @see Logger::error() */ - const WARNING = 0; + const WARNING = LogLevel::ERROR; /** - * @deprecated 2019.03 use Logger::warning() instead * @see Logger::warning() */ - const INFO = 1; + const INFO = LogLevel::WARNING; /** - * @deprecated 2019.03 use Logger::notice() instead * @see Logger::notice() */ - const TRACE = 2; + const TRACE = LogLevel::NOTICE; /** - * @deprecated 2019.03 use Logger::info() instead * @see Logger::info() */ - const DEBUG = 3; + const DEBUG = LogLevel::INFO; /** - * @deprecated 2019.03 use Logger::debug() instead * @see Logger::debug() */ - const DATA = 4; + const DATA = LogLevel::DEBUG; /** - * @deprecated 2019.03 use Logger::debug() instead * @see Logger::debug() */ - const ALL = 5; + const ALL = LogLevel::DEBUG; /** * @var array the legacy loglevels @@ -73,55 +64,38 @@ class Logger extends BaseObject /** * Sets the default logging handler for Friendica. - * @todo Can be combined with other handlers too if necessary, could be configurable. * * @param LoggerInterface $logger The Logger instance of this Application - * - * @throws InternalServerErrorException if the logger factory is incompatible to this logger */ - public static function setLogger($logger) + public static function init(LoggerInterface $logger) { - $debugging = Config::get('system', 'debugging'); - $logfile = Config::get('system', 'logfile'); - $loglevel = intval(Config::get('system', 'loglevel')); - - if (!$debugging || !$logfile) { - return; - } - - LoggerFactory::addStreamHandler($logger, $logfile, $loglevel); - - $logfile = Config::get('system', 'dlogfile'); - - if (!$logfile) { - return; - } - - $developIp = Config::get('system', 'dlogip'); + self::$logger = $logger; + } - self::$devLogger = LoggerFactory::createDev('develop', $developIp); - LoggerFactory::addStreamHandler(self::$devLogger, $logfile, LogLevel::DEBUG); + /** + * Sets the default dev-logging handler for Friendica. + * + * @param LoggerInterface $logger The Logger instance of this Application + */ + public static function setDevLogger(LoggerInterface $logger) + { + self::$devLogger = $logger; } /** * System is unusable. + * * @see LoggerInterface::emergency() * * @param string $message * @param array $context * * @return void - * + * @throws \Exception */ public static function emergency($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->emergency($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -135,17 +109,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function alert($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->alert($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -158,17 +126,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function critical($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->critical($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -180,17 +142,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function error($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->error($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -204,17 +160,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function warning($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->warning($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -225,17 +175,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function notice($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->notice($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -248,17 +192,11 @@ class Logger extends BaseObject * @param array $context * * @return void - * + * @throws \Exception */ public static function info($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->info($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } /** @@ -269,84 +207,43 @@ class Logger extends BaseObject * @param array $context * * @return void + * @throws \Exception */ public static function debug($message, $context = []) { - if (!isset(self::$logger)) { - return; - } - - $stamp1 = microtime(true); self::$logger->debug($message, $context); - self::getApp()->saveTimestamp($stamp1, 'file'); } - /** - * 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 + /** + * @brief Logs the given message at the given log level * - * @param int $level the level to be mapped + * @param string $msg + * @param string $level * - * @return string the PSR-3 compliant level + * @throws \Exception + * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead */ - private static function mapPSR3Level($level) + public static function log($msg, $level = LogLevel::INFO) { - switch ($level) { - case self::WARNING: - return LogLevel::ERROR; - case self::INFO: - return LogLevel::WARNING; - case self::TRACE: - return LogLevel::NOTICE; - case self::DEBUG: - return LogLevel::INFO; - case self::DATA: - return LogLevel::DEBUG; - case self::ALL: - return LogLevel::DEBUG; - default: - return LogLevel::CRITICAL; - } + self::$logger->log($level, $msg); } - /** - * @brief Logs the given message at the given log level - * - * @param string $msg - * @param int $level + /** + * @brief An alternative logger for development. + * Works largely as log() but allows developers + * to isolate particular elements they are targetting + * personally without background noise * - * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead - */ - public static function log($msg, $level = self::INFO) - { - if (!isset(self::$logger)) { - return; - } - - $loglevel = self::mapPSR3Level($level); - - $stamp1 = microtime(true); - self::$logger->log($loglevel, $msg); - self::getApp()->saveTimestamp($stamp1, "file"); - } - - /** - * @brief An alternative logger for development. - * Works largely as log() but allows developers - * to isolate particular elements they are targetting - * personally without background noise - * - * @param string $msg + * @param string $msg * @param string $level - */ - public static function devLog($msg, $level = LogLevel::DEBUG) - { - if (!isset(self::$logger)) { + * @throws \Exception + */ + public static function devLog($msg, $level = LogLevel::DEBUG) + { + if (!isset(self::$devLogger)) { return; } - $stamp1 = microtime(true); - self::$devLogger->log($level, $msg); - self::getApp()->saveTimestamp($stamp1, "file"); - } + self::$devLogger->log($level, $msg); + } }