X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FLogger.php;h=6dde142cc953f3feae67ec1c39d1d882d009909d;hb=62e7d0f40aac689b56e79b504c6eb2e59cbe6c14;hp=e8d95fa857bf67fae7e990e7cab8a7ac94d2ebd9;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index e8d95fa857..6dde142cc9 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -1,41 +1,64 @@
 <?php
 /**
- * @file src/Core/Logger.php
+ * @copyright Copyright (C) 2010-2021, 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\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 +89,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 +111,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 +135,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 +153,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 +170,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 +186,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 +204,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 +219,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 +236,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 +251,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 +265,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 +281,6 @@ class Logger extends BaseObject
 	 */
 	public static function devLog($msg, $level = LogLevel::DEBUG)
 	{
-		self::getClass('$devLogger')->log($level, $msg);
+		DI::devLogger()->log($level, $msg);
 	}
 }