Merge pull request #11506 from annando/featured-worker

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

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e376485e564adae830ee0e1103d71d1a868fe281..2a62e5513f60424fb1d6dd38f24ec01d9b20a5b8 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -1,44 +1,36 @@
 <?php
 /**
- * @file src/Core/Logger.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Util\Logger\WorkerLogger;
+use Friendica\DI;
+use Friendica\Core\Logger\Type\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
 /**
- * @brief Logger functions
+ * Logger functions
  */
-class Logger extends BaseObject
+class Logger
 {
-       /**
-        * @see Logger::error()
-        */
-       const WARNING = LogLevel::ERROR;
-       /**
-        * @see Logger::warning()
-        */
-       const INFO = LogLevel::WARNING;
-       /**
-        * @see Logger::notice()
-        */
-       const TRACE = LogLevel::NOTICE;
-       /**
-        * @see Logger::info()
-        */
-       const DEBUG = LogLevel::INFO;
-       /**
-        * @see Logger::debug()
-        */
-       const DATA = LogLevel::DEBUG;
-       /**
-        * @see Logger::debug()
-        */
-       const ALL = LogLevel::DEBUG;
-
        /**
         * @var LoggerInterface The default Logger type
         */
@@ -53,19 +45,16 @@ class Logger extends BaseObject
        private static $type = self::TYPE_LOGGER;
 
        /**
-        * @var array the legacy loglevels
-        * @deprecated 2019.03 use PSR-3 loglevels
-        * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
-        *
+        * @return LoggerInterface
         */
-       public static $levels = [
-               self::WARNING => 'Warning',
-               self::INFO => 'Info',
-               self::TRACE => 'Trace',
-               self::DEBUG => 'Debug',
-               self::DATA => 'Data',
-               self::ALL => 'All',
-       ];
+       private static function getWorker()
+       {
+               if (self::$type === self::TYPE_LOGGER) {
+                       return DI::logger();
+               } else {
+                       return DI::workerLogger();
+               }
+       }
 
        /**
         * Enable additional logging for worker usage
@@ -77,7 +66,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);
        }
 
        /**
@@ -101,7 +90,7 @@ class Logger extends BaseObject
         */
        public static function emergency($message, $context = [])
        {
-               self::getClass(self::$type)->emergency($message, $context);
+               self::getWorker()->emergency($message, $context);
        }
 
        /**
@@ -119,7 +108,7 @@ class Logger extends BaseObject
         */
        public static function alert($message, $context = [])
        {
-               self::getClass(self::$type)->alert($message, $context);
+               self::getWorker()->alert($message, $context);
        }
 
        /**
@@ -136,7 +125,7 @@ class Logger extends BaseObject
         */
        public static function critical($message, $context = [])
        {
-               self::getClass(self::$type)->critical($message, $context);
+               self::getWorker()->critical($message, $context);
        }
 
        /**
@@ -152,7 +141,7 @@ class Logger extends BaseObject
         */
        public static function error($message, $context = [])
        {
-               self::getClass(self::$type)->error($message, $context);
+               self::getWorker()->error($message, $context);
        }
 
        /**
@@ -170,7 +159,7 @@ class Logger extends BaseObject
         */
        public static function warning($message, $context = [])
        {
-               self::getClass(self::$type)->warning($message, $context);
+               self::getWorker()->warning($message, $context);
        }
 
        /**
@@ -185,7 +174,7 @@ class Logger extends BaseObject
         */
        public static function notice($message, $context = [])
        {
-               self::getClass(self::$type)->notice($message, $context);
+               self::getWorker()->notice($message, $context);
        }
 
        /**
@@ -202,7 +191,7 @@ class Logger extends BaseObject
         */
        public static function info($message, $context = [])
        {
-               self::getClass(self::$type)->info($message, $context);
+               self::getWorker()->info($message, $context);
        }
 
        /**
@@ -217,25 +206,12 @@ class Logger extends BaseObject
         */
        public static function debug($message, $context = [])
        {
-               self::getClass(self::$type)->debug($message, $context);
-       }
-
-           /**
-        * @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)
-       {
-               self::getClass(self::$type)->log($level, $msg);
+               self::getWorker()->debug($message, $context);
        }
 
        /**
-        * @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
@@ -246,6 +222,6 @@ class Logger extends BaseObject
         */
        public static function devLog($msg, $level = LogLevel::DEBUG)
        {
-               self::getClass('$devLogger')->log($level, $msg);
+               DI::devLogger()->log($level, $msg);
        }
 }