use Friendica\Core\Config\Configuration;
use Friendica\Core\Logger;
+use Friendica\Database\Database;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\Introspection;
-use Friendica\Util\Logger\Monolog\FriendicaDevelopHandler;
-use Friendica\Util\Logger\Monolog\FriendicaIntrospectionProcessor;
+use Friendica\Util\Logger\Monolog\DevelopHandler;
+use Friendica\Util\Logger\Monolog\IntrospectionProcessor;
+use Friendica\Util\Logger\ProfilerLogger;
use Friendica\Util\Logger\StreamLogger;
use Friendica\Util\Logger\SyslogLogger;
use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\Logger\WorkerLogger;
use Friendica\Util\Profiler;
use Monolog;
use Psr\Log\LoggerInterface;
{
/**
* A list of classes, which shouldn't get logged
+ *
* @var array
*/
private static $ignoreClassList = [
Logger::class,
Profiler::class,
- WorkerLogger::class
+ 'Friendica\\Util\\Logger',
];
/**
* Creates a new PSR-3 compliant logger instances
*
- * @param string $channel The channel of the logger instance
- * @param Configuration $config The config
+ * @param string $channel The channel of the logger instance
+ * @param Configuration $config The config
* @param Profiler $profiler The profiler of the app
*
* @return LoggerInterface The PSR-3 compliant logger instance
* @throws \Exception
* @throws InternalServerErrorException
*/
- public static function create($channel, Configuration $config, Profiler $profiler)
+ public static function create($channel, Database $database, Configuration $config, Profiler $profiler)
{
if (empty($config->get('system', 'debugging', false))) {
$logger = new VoidLogger();
+ $database->setLogger($logger);
Logger::init($logger);
return $logger;
}
$introspection = new Introspection(self::$ignoreClassList);
- $level = $config->get('system', 'loglevel');
-
- switch ($config->get('system', 'logger_adapter', 'monolog')) {
-
- case 'syslog':
- $logger = new SyslogLogger($channel, $introspection, $profiler, $level);
- break;
-
- case 'stream':
- $logger = new StreamLogger($channel, $introspection, $profiler, $level);
- break;
+ $level = $config->get('system', 'loglevel');
+ $loglevel = self::mapLegacyConfigDebugLevel((string)$level);
+ switch ($config->get('system', 'logger_config', 'stream')) {
case 'monolog':
- default:
$loggerTimeZone = new \DateTimeZone('UTC');
Monolog\Logger::setTimezone($loggerTimeZone);
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\UidProcessor());
- $logger->pushProcessor(new FriendicaIntrospectionProcessor($introspection, LogLevel::DEBUG));
+ $logger->pushProcessor(new IntrospectionProcessor($introspection, LogLevel::DEBUG));
$stream = $config->get('system', 'logfile');
- $loglevel = self::mapLegacyConfigDebugLevel((string)$level);
- static::addStreamHandler($logger, $stream, $loglevel);
+ // just add a stream in case it's either writable or not file
+ if (!is_file($stream) || is_writable($stream)) {
+ static::addStreamHandler($logger, $stream, $loglevel);
+ }
+ break;
+
+ case 'syslog':
+ $logger = new SyslogLogger($channel, $introspection, $loglevel);
+ break;
+
+ case 'stream':
+ default:
+ $stream = $config->get('system', 'logfile');
+ // just add a stream in case it's either writable or not file
+ if (!is_file($stream) || is_writable($stream)) {
+ $logger = new StreamLogger($channel, $stream, $introspection, $loglevel);
+ } else {
+ $logger = new VoidLogger();
+ }
break;
}
+ $profiling = $config->get('system', 'profiling', false);
+
+ // In case profiling is enabled, wrap the ProfilerLogger around the current logger
+ if (isset($profiling) && $profiling !== false) {
+ $logger = new ProfilerLogger($logger, $profiler);
+ }
+
+ $database->setLogger($logger);
Logger::init($logger);
return $logger;
*
* It should never get filled during normal usage of Friendica
*
- * @param string $channel The channel of the logger instance
- * @param Configuration $config The config
+ * @param string $channel The channel of the logger instance
+ * @param Configuration $config The config
+ * @param Profiler $profiler The profiler of the app
*
* @return LoggerInterface The PSR-3 compliant logger instance
+ *
* @throws InternalServerErrorException
+ * @throws \Exception
*/
- public static function createDev($channel, Configuration $config)
+ public static function createDev($channel, Configuration $config, Profiler $profiler)
{
$debugging = $config->get('system', 'debugging');
$stream = $config->get('system', 'dlogfile');
$developerIp = $config->get('system', 'dlogip');
- if (!isset($developerIp) || !$debugging) {
- return null;
+ if ((!isset($developerIp) || !$debugging) &&
+ (!is_file($stream) || is_writable($stream))) {
+ $logger = new VoidLogger();
+ Logger::setDevLogger($logger);
+ return $logger;
}
$loggerTimeZone = new \DateTimeZone('UTC');
$introspection = new Introspection(self::$ignoreClassList);
- $logger = new Monolog\Logger($channel);
- $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
- $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
- $logger->pushProcessor(new Monolog\Processor\UidProcessor());
- $logger->pushProcessor(new FriendicaIntrospectionProcessor($introspection, LogLevel::DEBUG));
+ switch ($config->get('system', 'logger_config', 'stream')) {
+
+ case 'monolog':
+ $loggerTimeZone = new \DateTimeZone('UTC');
+ Monolog\Logger::setTimezone($loggerTimeZone);
+
+ $logger = new Monolog\Logger($channel);
+ $logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
+ $logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
+ $logger->pushProcessor(new Monolog\Processor\UidProcessor());
+ $logger->pushProcessor(new IntrospectionProcessor($introspection, LogLevel::DEBUG));
- $logger->pushHandler(new FriendicaDevelopHandler($developerIp));
+ $logger->pushHandler(new DevelopHandler($developerIp));
- static::addStreamHandler($logger, $stream, LogLevel::DEBUG);
+ static::addStreamHandler($logger, $stream, LogLevel::DEBUG);
+ break;
+
+ case 'syslog':
+ $logger = new SyslogLogger($channel, $introspection, LogLevel::DEBUG);
+ break;
+
+ case 'stream':
+ default:
+ $logger = new StreamLogger($channel, $stream, $introspection, LogLevel::DEBUG);
+ break;
+ }
+
+ $profiling = $config->get('system', 'profiling', false);
+
+ // In case profiling is enabled, wrap the ProfilerLogger around the current logger
+ if (isset($profiling) && $profiling !== false) {
+ $logger = new ProfilerLogger($logger, $profiler);
+ }
Logger::setDevLogger($logger);
/**
* 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
/**
* Adding a handler to a given logger instance
*
- * @param LoggerInterface $logger The logger instance
- * @param mixed $stream The stream which handles the logger output
- * @param string $level The level, for which this handler at least should handle logging
+ * @param LoggerInterface $logger The logger instance
+ * @param mixed $stream The stream which handles the logger output
+ * @param string $level The level, for which this handler at least should handle logging
*
* @return void
*
projects / friendica.git / blobdiff