Merge pull request #8222 from annando/ap-gnusocial

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

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e8d95fa857bf67fae7e990e7cab8a7ac94d2ebd9..05895bb89b6e7ceb3405c8eeed118eae4b58ec98 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -4,38 +4,44 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Util\Logger\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
 /**
- * @brief Logger functions
+ * Logger functions
  */
-class Logger extends BaseObject
+class Logger
 {
        /**
         * @see Logger::error()
+        * @deprecated since 2019.01
         */
        const WARNING = LogLevel::ERROR;
        /**
         * @see Logger::warning()
+        * @deprecated since 2019.01
         */
        const INFO = LogLevel::WARNING;
        /**
         * @see Logger::notice()
+        * @deprecated since 2019.01
         */
        const TRACE = LogLevel::NOTICE;
        /**
         * @see Logger::info()
+        * @deprecated since 2019.01
         */
        const DEBUG = LogLevel::INFO;
        /**
         * @see Logger::debug()
+        * @deprecated since 2019.01
         */
        const DATA = LogLevel::DEBUG;
        /**
         * @see Logger::debug()
+        * @deprecated since 2019.01
         */
        const ALL = LogLevel::DEBUG;
 
@@ -66,6 +72,18 @@ class Logger extends BaseObject
                self::DATA => 'Data',
        ];
 
+       /**
+        * @return LoggerInterface
+        */
+       private static function getWorker()
+       {
+               if (self::$type === self::TYPE_LOGGER) {
+                       return DI::logger();
+               } else {
+                       return DI::workerLogger();
+               }
+       }
+
        /**
         * Enable additional logging for worker usage
         *
@@ -76,7 +94,7 @@ class Logger extends BaseObject
        public static function enableWorker(string $functionName)
        {
                self::$type = self::TYPE_WORKER;
-               self::getClass(self::$type)->setFunctionName($functionName);
+               self::getWorker()->setFunctionName($functionName);
        }
 
        /**
@@ -100,7 +118,7 @@ class Logger extends BaseObject
         */
        public static function emergency($message, $context = [])
        {
-               self::getClass(self::$type)->emergency($message, $context);
+               self::getWorker()->emergency($message, $context);
        }
 
        /**
@@ -118,7 +136,7 @@ class Logger extends BaseObject
         */
        public static function alert($message, $context = [])
        {
-               self::getClass(self::$type)->alert($message, $context);
+               self::getWorker()->alert($message, $context);
        }
 
        /**
@@ -135,7 +153,7 @@ class Logger extends BaseObject
         */
        public static function critical($message, $context = [])
        {
-               self::getClass(self::$type)->critical($message, $context);
+               self::getWorker()->critical($message, $context);
        }
 
        /**
@@ -151,7 +169,7 @@ class Logger extends BaseObject
         */
        public static function error($message, $context = [])
        {
-               self::getClass(self::$type)->error($message, $context);
+               self::getWorker()->error($message, $context);
        }
 
        /**
@@ -169,7 +187,7 @@ class Logger extends BaseObject
         */
        public static function warning($message, $context = [])
        {
-               self::getClass(self::$type)->warning($message, $context);
+               self::getWorker()->warning($message, $context);
        }
 
        /**
@@ -184,7 +202,7 @@ class Logger extends BaseObject
         */
        public static function notice($message, $context = [])
        {
-               self::getClass(self::$type)->notice($message, $context);
+               self::getWorker()->notice($message, $context);
        }
 
        /**
@@ -201,7 +219,7 @@ class Logger extends BaseObject
         */
        public static function info($message, $context = [])
        {
-               self::getClass(self::$type)->info($message, $context);
+               self::getWorker()->info($message, $context);
        }
 
        /**
@@ -216,11 +234,11 @@ class Logger extends BaseObject
         */
        public static function debug($message, $context = [])
        {
-               self::getClass(self::$type)->debug($message, $context);
+               self::getWorker()->debug($message, $context);
        }
 
-           /**
-        * @brief Logs the given message at the given log level
+       /**
+        * Logs the given message at the given log level
         *
         * @param string $msg
         * @param string $level
@@ -230,11 +248,12 @@ class Logger extends BaseObject
         */
        public static function log($msg, $level = LogLevel::INFO)
        {
-               self::getClass(self::$type)->log($level, $msg);
+               self::getWorker()->log($level, $msg);
        }
 
        /**
-        * @brief An alternative logger for development.
+        * An alternative logger for development.
+        *
         * Works largely as log() but allows developers
         * to isolate particular elements they are targetting
         * personally without background noise
@@ -245,6 +264,6 @@ class Logger extends BaseObject
         */
        public static function devLog($msg, $level = LogLevel::DEBUG)
        {
-               self::getClass('$devLogger')->log($level, $msg);
+               DI::devLogger()->log($level, $msg);
        }
 }