X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FLogger.php;h=3cb22e1e478aeef78dc2e2467af3fe35523c4771;hb=11e39da6ccd4ff86be95de6af9e6f84ca67996d9;hp=fe39d3feb2c43c6ff548e46b010a8897c07c7f87;hpb=6150c2fa9cbb15efbdd1432a295ece64086959ac;p=friendica.git

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index fe39d3feb2..3cb22e1e47 100644
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Util\LoggerFactory;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
@@ -16,35 +14,29 @@ use Psr\Log\LogLevel;
 class Logger extends BaseObject
 {
 	/**
-	 * @deprecated 2019.03 use Logger::error() instead
 	 * @see Logger::error()
 	 */
-	const WARNING = 0;
+	const WARNING = LogLevel::ERROR;
 	/**
-	 * @deprecated 2019.03 use Logger::warning() instead
 	 * @see Logger::warning()
 	 */
-	const INFO = 1;
+	const INFO = LogLevel::WARNING;
 	/**
-	 * @deprecated 2019.03 use Logger::notice() instead
 	 * @see Logger::notice()
 	 */
-	const TRACE = 2;
+	const TRACE = LogLevel::NOTICE;
 	/**
-	 * @deprecated 2019.03 use Logger::info() instead
 	 * @see Logger::info()
 	 */
-	const DEBUG = 3;
+	const DEBUG = LogLevel::INFO;
 	/**
-	 * @deprecated 2019.03 use Logger::debug() instead
 	 * @see Logger::debug()
 	 */
-	const DATA = 4;
+	const DATA = LogLevel::DEBUG;
 	/**
-	 * @deprecated 2019.03 use Logger::debug() instead
 	 * @see Logger::debug()
 	 */
-	const ALL = 5;
+	const ALL = LogLevel::DEBUG;
 
 	/**
 	 * @var array the legacy loglevels
@@ -73,48 +65,34 @@ class Logger extends BaseObject
 
 	/**
 	 * Sets the default logging handler for Friendica.
-	 * @todo Can be combined with other handlers too if necessary, could be configurable.
 	 *
 	 * @param LoggerInterface $logger The Logger instance of this Application
-	 *
-	 * @throws InternalServerErrorException if the logger factory is incompatible to this logger
 	 */
-	public static function setLogger($logger)
+	public static function init(LoggerInterface $logger)
 	{
-		$debugging = Config::get('system', 'debugging');
-		$logfile = Config::get('system', 'logfile');
-		$loglevel = intval(Config::get('system', 'loglevel'));
-
-		if (!$debugging || !$logfile) {
-			return;
-		}
-
-		$level = self::mapPSR3Level($loglevel);
-		LoggerFactory::addStreamHandler($logger, $logfile, $level);
-
 		self::$logger = $logger;
+	}
 
-		$logfile = Config::get('system', 'dlogfile');
-
-		if (!$logfile) {
-			return;
-		}
-
-		$developIp = Config::get('system', 'dlogip');
-
-		self::$devLogger = LoggerFactory::createDev('develop', $developIp);
-		LoggerFactory::addStreamHandler(self::$devLogger, $logfile, LogLevel::DEBUG);
+	/**
+	 * Sets the default dev-logging handler for Friendica.
+	 *
+	 * @param LoggerInterface $logger The Logger instance of this Application
+	 */
+	public static function setDevLogger(LoggerInterface $logger)
+	{
+		self::$devLogger = $logger;
 	}
 
 	/**
 	 * System is unusable.
+	 *
 	 * @see LoggerInterface::emergency()
 	 *
 	 * @param string $message
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function emergency($message, $context = [])
 	{
@@ -124,7 +102,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->emergency($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->GetProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -138,7 +116,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function alert($message, $context = [])
 	{
@@ -148,7 +126,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->alert($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -161,7 +139,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function critical($message, $context = [])
 	{
@@ -171,7 +149,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->critical($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -183,7 +161,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function error($message, $context = [])
 	{
@@ -194,7 +172,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->error($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -208,7 +186,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function warning($message, $context = [])
 	{
@@ -218,7 +196,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->warning($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -229,7 +207,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function notice($message, $context = [])
 	{
@@ -239,7 +217,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->notice($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -252,7 +230,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
-	 *
+	 * @throws \Exception
 	 */
 	public static function info($message, $context = [])
 	{
@@ -262,7 +240,7 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->info($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
 	/**
@@ -273,6 +251,7 @@ class Logger extends BaseObject
 	 * @param array  $context
 	 *
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function debug($message, $context = [])
 	{
@@ -282,75 +261,47 @@ class Logger extends BaseObject
 
 		$stamp1 = microtime(true);
 		self::$logger->debug($message, $context);
-		self::getApp()->saveTimestamp($stamp1, 'file');
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
 	}
 
-	/**
-	 * Mapping a legacy level to the PSR-3 compliant levels
-	 * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
+	    /**
+	 * @brief Logs the given message at the given log level
 	 *
-	 * @param int $level the level to be mapped
+	 * @param string $msg
+	 * @param string $level
 	 *
-	 * @return string the PSR-3 compliant level
+	 * @throws \Exception
+	 * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
 	 */
-	private static function mapPSR3Level($level)
+	public static function log($msg, $level = LogLevel::INFO)
 	{
-		switch ($level) {
-			case self::WARNING:
-				return LogLevel::ERROR;
-			case self::INFO:
-				return LogLevel::WARNING;
-			case self::TRACE:
-				return LogLevel::NOTICE;
-			case self::DEBUG:
-				return LogLevel::INFO;
-			case self::DATA:
-				return LogLevel::DEBUG;
-			case self::ALL:
-				return LogLevel::DEBUG;
-			default:
-				return LogLevel::CRITICAL;
-		}
-	}
-
-    /**
-     * @brief Logs the given message at the given log level
-     *
-     * @param string $msg
-     * @param int $level
-	 *
-	 * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
-     */
-    public static function log($msg, $level = self::INFO)
-    {
 		if (!isset(self::$logger)) {
 			return;
 		}
 
-		$loglevel = self::mapPSR3Level($level);
-
-        $stamp1 = microtime(true);
-		self::$logger->log($loglevel, $msg);
-        self::getApp()->saveTimestamp($stamp1, "file");
-    }
+		$stamp1 = microtime(true);
+		self::$logger->log($level, $msg);
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+	}
 
-    /**
-     * @brief An alternative logger for development.
-     * Works largely as log() but allows developers
-     * to isolate particular elements they are targetting
-     * personally without background noise
-     *
-     * @param string $msg
+	/**
+	 * @brief An alternative logger for development.
+	 * Works largely as log() but allows developers
+	 * to isolate particular elements they are targetting
+	 * personally without background noise
+	 *
+	 * @param string $msg
 	 * @param string $level
-     */
-    public static function devLog($msg, $level = LogLevel::DEBUG)
-    {
+	 * @throws \Exception
+	 */
+	public static function devLog($msg, $level = LogLevel::DEBUG)
+	{
 		if (!isset(self::$logger)) {
 			return;
 		}
 
-        $stamp1 = microtime(true);
-        self::$devLogger->log($level, $msg);
-        self::getApp()->saveTimestamp($stamp1, "file");
-    }
+		$stamp1 = microtime(true);
+		self::$devLogger->log($level, $msg);
+		self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+	}
 }