namespace Friendica\Core;
use Friendica\BaseObject;
+use Friendica\Factory\LoggerFactory;
use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Util\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
{
$debugging = Config::get('system', 'debugging');
$logfile = Config::get('system', 'logfile');
- $loglevel = intval(Config::get('system', 'loglevel'));
+ $loglevel = Config::get('system', 'loglevel');
if (!$debugging || !$logfile) {
return;
}
- $level = self::mapPSR3Level($loglevel);
- LoggerFactory::addStreamHandler($logger, $logfile, $level);
+ $loglevel = self::mapLegacyConfigDebugLevel((string)$loglevel);
+
+ LoggerFactory::addStreamHandler($logger, $logfile, $loglevel);
self::$logger = $logger;
LoggerFactory::addStreamHandler(self::$devLogger, $logfile, LogLevel::DEBUG);
}
+ /**
+ * 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
+ *
+ * @param string $level the level to be mapped
+ *
+ * @return string the PSR-3 compliant level
+ */
+ private static function mapLegacyConfigDebugLevel($level)
+ {
+ switch ($level) {
+ // legacy WARNING
+ case "0":
+ return LogLevel::ERROR;
+ // legacy INFO
+ case "1":
+ return LogLevel::WARNING;
+ // legacy TRACE
+ case "2":
+ return LogLevel::NOTICE;
+ // legacy DEBUG
+ case "3":
+ return LogLevel::INFO;
+ // legacy DATA
+ case "4":
+ return LogLevel::DEBUG;
+ // legacy ALL
+ case "5":
+ return LogLevel::DEBUG;
+ // default if nothing set
+ default:
+ return $level;
+ }
+ }
+
/**
* System is unusable.
+ *
* @see LoggerInterface::emergency()
*
* @param string $message
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function emergency($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function alert($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function critical($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function error($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function warning($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function notice($message, $context = [])
{
* @param array $context
*
* @return void
- *
+ * @throws \Exception
*/
public static function info($message, $context = [])
{
* @param array $context
*
* @return void
+ * @throws \Exception
*/
public static function debug($message, $context = [])
{
* @brief Logs the given message at the given log level
*
* @param string $msg
- * @param int $level
+ * @param string $level
*
+ * @throws \Exception
* @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
*/
- public static function log($msg, $level = LogLevel::NOTICE)
+ public static function log($msg, $level = LogLevel::INFO)
{
if (!isset(self::$logger)) {
return;
self::getApp()->saveTimestamp($stamp1, "file");
}
- /**
- * @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
- */
+ * @throws \Exception
+ */
public static function devLog($msg, $level = LogLevel::DEBUG)
{
if (!isset(self::$logger)) {