namespace Friendica\Core;
use Friendica\BaseObject;
-use Friendica\Factory\LoggerFactory;
-use Friendica\Network\HTTPException\InternalServerErrorException;
use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
/**
* 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 = Config::get('system', 'loglevel');
-
- if (!$debugging || !$logfile) {
- return;
- }
-
- $loglevel = self::mapLegacyConfigDebugLevel((string)$loglevel);
-
- LoggerFactory::addStreamHandler($logger, $logfile, $loglevel);
-
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);
}
/**
- * 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
+ * Sets the default dev-logging handler for Friendica.
*
- * @param string $level the level to be mapped
- *
- * @return string the PSR-3 compliant level
+ * @param LoggerInterface $logger The Logger instance of this Application
*/
- private static function mapLegacyConfigDebugLevel($level)
+ public static function setDevLogger(LoggerInterface $logger)
{
- 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;
- }
+ self::$devLogger = $logger;
}
/**
$stamp1 = microtime(true);
self::$logger->emergency($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->GetProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->alert($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->critical($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->error($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->warning($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->notice($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->info($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
/**
$stamp1 = microtime(true);
self::$logger->debug($message, $context);
- self::getApp()->saveTimestamp($stamp1, 'file');
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, 'file', System::callstack());
}
- /**
- * @brief Logs the given message at the given log level
- *
- * @param string $msg
- * @param string $level
+ /**
+ * @brief Logs the given message at the given log level
+ *
+ * @param string $msg
+ * @param string $level
*
* @throws \Exception
* @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
- */
- public static function log($msg, $level = LogLevel::INFO)
- {
+ */
+ public static function log($msg, $level = LogLevel::INFO)
+ {
if (!isset(self::$logger)) {
return;
}
- $stamp1 = microtime(true);
+ $stamp1 = microtime(true);
self::$logger->log($level, $msg);
- self::getApp()->saveTimestamp($stamp1, "file");
- }
+ self::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+ }
/**
* @brief An alternative logger for development.
* @param string $level
* @throws \Exception
*/
- public static function devLog($msg, $level = LogLevel::DEBUG)
- {
+ 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());
+ }
}