Remove unused killme()

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

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e376485e564adae830ee0e1103d71d1a868fe281..0ce2a6e675a2e6cdf3c91d48aac1e18f292229bc 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -4,7 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Util\Logger\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -12,7 +12,7 @@ use Psr\Log\LogLevel;
 /**
  * @brief Logger functions
  */
-class Logger extends BaseObject
+class Logger
 {
        /**
         * @see Logger::error()
@@ -64,9 +64,20 @@ class Logger extends BaseObject
                self::TRACE => 'Trace',
                self::DEBUG => 'Debug',
                self::DATA => 'Data',
-               self::ALL => 'All',
        ];
 
+       /**
+        * @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
         *
@@ -77,7 +88,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 +112,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 +130,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 +147,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 +163,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 +181,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 +196,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 +213,7 @@ class Logger extends BaseObject
         */
        public static function info($message, $context = [])
        {
-               self::getClass(self::$type)->info($message, $context);
+               self::getWorker()->info($message, $context);
        }
 
        /**
@@ -217,7 +228,7 @@ class Logger extends BaseObject
         */
        public static function debug($message, $context = [])
        {
-               self::getClass(self::$type)->debug($message, $context);
+               self::getWorker()->debug($message, $context);
        }
 
            /**
@@ -231,7 +242,7 @@ class Logger extends BaseObject
         */
        public static function log($msg, $level = LogLevel::INFO)
        {
-               self::getClass(self::$type)->log($level, $msg);
+               self::getWorker()->log($level, $msg);
        }
 
        /**
@@ -246,6 +257,6 @@ class Logger extends BaseObject
         */
        public static function devLog($msg, $level = LogLevel::DEBUG)
        {
-               self::getClass('$devLogger')->log($level, $msg);
+               DI::devLogger()->log($level, $msg);
        }
 }