Merge pull request #6955 from tobiasd/20190331-vier

[friendica.git] / src / Core / Logger.php

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 6b8112796f557f00dea156a9c22fef3993097584..fc2dde1dfe703f3de75e6044cc7fccc8b699e7bd 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -4,16 +4,13 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Factory\LoggerFactory;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
 /**
  * @brief Logger functions
  */
-class Logger extends BaseObject
+class Logger
 {
        /**
         * @see Logger::error()
@@ -67,73 +64,22 @@ 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 = Config::get('system', 'loglevel');
-
-               if (!$debugging || !$logfile) {
-                       return;
-               }
-
-               $loglevel = self::mapLegacyConfigDebugLevel((string)$loglevel);
-
-               LoggerFactory::addStreamHandler($logger, $logfile, $loglevel);
-
                self::$logger = $logger;
-
-               $logfile = Config::get('system', 'dlogfile');
-
-               if (!$logfile) {
-                       return;
-               }
-
-               $developIp = Config::get('system', 'dlogip');
-
-               self::$devLogger = LoggerFactory::createDev('develop', $developIp);
-               LoggerFactory::addStreamHandler(self::$devLogger, $logfile, LogLevel::DEBUG);
        }
 
        /**
-        * 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 string $level the level to be mapped
+        * Sets the default dev-logging handler for Friendica.
         *
-        * @return string the PSR-3 compliant level
+        * @param LoggerInterface $logger The Logger instance of this Application
         */
-       private static function mapLegacyConfigDebugLevel($level)
+       public static function setDevLogger(LoggerInterface $logger)
        {
-               switch ($level) {
-                       // legacy WARNING
-                       case "0":
-                               return LogLevel::ERROR;
-                       // legacy INFO
-                       case "1":
-                               return LogLevel::WARNING;
-                       // legacy TRACE
-                       case "2":
-                               return LogLevel::NOTICE;
-                       // legacy DEBUG
-                       case "3":
-                               return LogLevel::INFO;
-                       // legacy DATA
-                       case "4":
-                               return LogLevel::DEBUG;
-                       // legacy ALL
-                       case "5":
-                               return LogLevel::DEBUG;
-                       // default if nothing set
-                       default:
-                               return $level;
-               }
+               self::$devLogger = $logger;
        }
 
        /**
@@ -149,13 +95,7 @@ class Logger extends BaseObject
         */
        public static function emergency($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->emergency($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -173,13 +113,7 @@ class Logger extends BaseObject
         */
        public static function alert($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->alert($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -196,13 +130,7 @@ class Logger extends BaseObject
         */
        public static function critical($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->critical($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -218,14 +146,7 @@ class Logger extends BaseObject
         */
        public static function error($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       echo "not set!?\n";
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->error($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -243,13 +164,7 @@ class Logger extends BaseObject
         */
        public static function warning($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->warning($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -264,13 +179,7 @@ class Logger extends BaseObject
         */
        public static function notice($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->notice($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -287,13 +196,7 @@ class Logger extends BaseObject
         */
        public static function info($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->info($message, $context);
-               self::getApp()->saveTimestamp($stamp1, 'file');
        }
 
        /**
@@ -308,34 +211,22 @@ class Logger extends BaseObject
         */
        public static function debug($message, $context = [])
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
                self::$logger->debug($message, $context);
-               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::INFO)
-    {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-        $stamp1 = microtime(true);
+        */
+       public static function log($msg, $level = LogLevel::INFO)
+       {
                self::$logger->log($level, $msg);
-        self::getApp()->saveTimestamp($stamp1, "file");
-    }
+       }
 
        /**
         * @brief An alternative logger for development.
@@ -347,14 +238,12 @@ class Logger extends BaseObject
         * @param string $level
         * @throws \Exception
         */
-    public static function devLog($msg, $level = LogLevel::DEBUG)
-    {
-               if (!isset(self::$logger)) {
+       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);
+       }
 }