Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 10:30:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace string namespaces with ::class

Browse source
This commit is contained in:
Philipp Holzer 2019-02-24 13:40:54 +01:00
parent 9f11476ca0
commit 5fc42a744e
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
11 changed files with 52 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Factory/LoggerFactory.php
View file

@ -20,6 +20,16 @@ use Psr\Log\LogLevel;
*/
class LoggerFactory
{
/**
* A list of classes, which shouldn't get logged
* @var array
*/
private static $ignoreClassList = [
Logger::class,
Profiler::class,
WorkerLogger::class
];
/**
* Creates a new PSR-3 compliant logger instances
*
@ -34,7 +44,7 @@ class LoggerFactory
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\UidProcessor());
$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, [Logger::class, Profiler::class, WorkerLogger::class]));
$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, self::$ignoreClassList));
$debugging = $config->get('system', 'debugging');
$stream = $config->get('system', 'logfile');
@ -79,7 +89,7 @@ class LoggerFactory
$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\UidProcessor());
$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, ['Friendica\\Core\\Logger']));
$logger->pushProcessor(new FriendicaIntrospectionProcessor(LogLevel::DEBUG, self::$ignoreClassList));
$logger->pushHandler(new FriendicaDevelopHandler($developerIp));
@ -146,6 +156,13 @@ class LoggerFactory
if (!is_int($loglevel)) {
$loglevel = LogLevel::NOTICE;
}
// if the stream is a file and it isn't writeable, add a null handler and return
if (is_file($stream) && !is_writable($stream)) {
$logger->pushHandler(new Monolog\Handler\NullHandler());
return;
}
$fileHandler = new Monolog\Handler\StreamHandler($stream, $loglevel);
$formatter = new Monolog\Formatter\LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");

4
src/Factory/ProfilerFactory.php
View file

@ -17,9 +17,9 @@ class ProfilerFactory
public static function create(IConfigCache $configCache)
{
$enabled = $configCache->get('system', 'profiler');
$enabled = isset($enabled) && $enabled !== '!<unset>!';
$enabled = isset($enabled) && $enabled !== '0';
$renderTime = $configCache->get('rendertime', 'callstack');
$renderTime = isset($renderTime) && $renderTime !== '!<unset>!';
$renderTime = isset($renderTime) && $renderTime !== '0';
return new Profiler($enabled, $renderTime);
}