Remove unused killme()

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

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index a2e587342d528d1734a4984b0ae6ef33148b03d4..0ce2a6e675a2e6cdf3c91d48aac1e18f292229bc 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -4,14 +4,15 @@
  */
 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
  */
-class Logger extends BaseObject
+class Logger
 {
        /**
         * @see Logger::error()
@@ -38,6 +39,19 @@ class Logger extends BaseObject
         */
        const ALL = LogLevel::DEBUG;
 
+       /**
+        * @var LoggerInterface The default Logger type
+        */
+       const TYPE_LOGGER = LoggerInterface::class;
+       /**
+        * @var WorkerLogger A specific worker logger type, which can be anabled
+        */
+       const TYPE_WORKER = WorkerLogger::class;
+       /**
+        * @var LoggerInterface The current logger type
+        */
+       private static $type = self::TYPE_LOGGER;
+
        /**
         * @var array the legacy loglevels
         * @deprecated 2019.03 use PSR-3 loglevels
@@ -50,37 +64,39 @@ class Logger extends BaseObject
                self::TRACE => 'Trace',
                self::DEBUG => 'Debug',
                self::DATA => 'Data',
-               self::ALL => 'All',
        ];
 
        /**
-        * @var LoggerInterface A PSR-3 compliant logger instance
-        */
-       private static $logger;
-
-       /**
-        * @var LoggerInterface A PSR-3 compliant logger instance for developing only
+        * @return LoggerInterface
         */
-       private static $devLogger;
+       private static function getWorker()
+       {
+               if (self::$type === self::TYPE_LOGGER) {
+                       return DI::logger();
+               } else {
+                       return DI::workerLogger();
+               }
+       }
 
        /**
-        * Sets the default logging handler for Friendica.
+        * Enable additional logging for worker usage
+        *
+        * @param string $functionName The worker function, which got called
         *
-        * @param LoggerInterface $logger The Logger instance of this Application
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function setLogger($logger)
+       public static function enableWorker(string $functionName)
        {
-               self::$logger = $logger;
+               self::$type = self::TYPE_WORKER;
+               self::getWorker()->setFunctionName($functionName);
        }
 
        /**
-        * Sets the default dev-logging handler for Friendica.
-        *
-        * @param LoggerInterface $logger The Logger instance of this Application
+        * Disable additional logging for worker usage
         */
-       public static function setDevLogger($logger)
+       public static function disableWorker()
        {
-               self::$devLogger = $logger;
+               self::$type = self::TYPE_LOGGER;
        }
 
        /**
@@ -96,13 +112,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()->GetProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->emergency($message, $context);
        }
 
        /**
@@ -120,13 +130,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->alert($message, $context);
        }
 
        /**
@@ -143,13 +147,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->critical($message, $context);
        }
 
        /**
@@ -165,14 +163,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->error($message, $context);
        }
 
        /**
@@ -190,13 +181,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->warning($message, $context);
        }
 
        /**
@@ -211,13 +196,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->notice($message, $context);
        }
 
        /**
@@ -234,13 +213,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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->info($message, $context);
        }
 
        /**
@@ -255,13 +228,7 @@ 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()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
+               self::getWorker()->debug($message, $context);
        }
 
            /**
@@ -275,13 +242,7 @@ class Logger extends BaseObject
         */
        public static function log($msg, $level = LogLevel::INFO)
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
-               self::$logger->log($level, $msg);
-               self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               self::getWorker()->log($level, $msg);
        }
 
        /**
@@ -296,12 +257,6 @@ class Logger extends BaseObject
         */
        public static function devLog($msg, $level = LogLevel::DEBUG)
        {
-               if (!isset(self::$logger)) {
-                       return;
-               }
-
-               $stamp1 = microtime(true);
-               self::$devLogger->log($level, $msg);
-               self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::devLogger()->log($level, $msg);
        }
 }