Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions

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

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index d2b9e21eef94c00a2ffd1128aae8dfe76d574c32..3cb22e1e478aeef78dc2e2467af3fe35523c4771 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Factory\LoggerFactory;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
@@ -67,73 +65,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
+        * Sets the default dev-logging handler for Friendica.
         *
-        * @param string $level the level to be mapped
-        *
-        * @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;
        }
 
        /**
@@ -317,25 +264,25 @@ class Logger extends BaseObject
                self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
        }
 
-    /**
-     * @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)
-    {
+        */
+       public static function log($msg, $level = LogLevel::INFO)
+       {
                if (!isset(self::$logger)) {
                        return;
                }
 
-        $stamp1 = microtime(true);
+               $stamp1 = microtime(true);
                self::$logger->log($level, $msg);
                self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
-    }
+       }
 
        /**
         * @brief An alternative logger for development.
@@ -347,14 +294,14 @@ class Logger extends BaseObject
         * @param string $level
         * @throws \Exception
         */
-    public static function devLog($msg, $level = LogLevel::DEBUG)
-    {
+       public static function devLog($msg, $level = LogLevel::DEBUG)
+       {
                if (!isset(self::$logger)) {
                        return;
                }
 
-        $stamp1 = microtime(true);
+               $stamp1 = microtime(true);
                self::$devLogger->log($level, $msg);
                self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
-    }
+       }
 }