clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6510 from annando/logger2 

Logger: Display the correct file, function and line number
This commit is contained in:
Tobias Diekershoff 2019-01-24 16:11:10 +01:00 committed by GitHub
parent 45f0f23f08 b90c8c6346
commit 99199ee93b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Util/Logger/FriendicaProcessor.php
View File

@ -22,6 +22,10 @@ class FriendicaProcessor implements ProcessorInterface
'call_user_func_array', 'call_user_func_array',
]; ];
private $skipFiles = [
'Logger.php'
];
/** /**
* @param string|int $level The minimum logging level at which this Processor will be triggered * @param string|int $level The minimum logging level at which this Processor will be triggered
* @param int $skipStackFramesCount If the logger should use information from other hierarchy levels of the call * @param int $skipStackFramesCount If the logger should use information from other hierarchy levels of the call
@ -41,30 +45,20 @@ class FriendicaProcessor implements ProcessorInterface
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
// skip first since it's always the current method $i = 1;
array_shift($trace);
// the call_user_func call is also skipped
array_shift($trace);
$i = 0; // Skip everything that we shouldn't display
while (in_array($trace[$i]['function'], $this->skipFunctions) ||
while ($this->isSkippedFunction($trace, $i)) { !isset($trace[$i - 1]['file']) ||
if (in_array($trace[$i]['function'], $this->skipFunctions)) { in_array(basename($trace[$i - 1]['file']), $this->skipFiles)) {
$i++; $i++;
continue;
}
break;
} }
$i += $this->skipStackFramesCount;
// we should have the call source now // we should have the call source now
$record['extra'] = array_merge( $record['extra'] = array_merge(
$record['extra'], $record['extra'],
[ [
'file' => isset($trace[$i - 1]['file']) ? $trace[$i - 1]['file'] : null, 'file' => isset($trace[$i - 1]['file']) ? basename($trace[$i - 1]['file']) : null,
'line' => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null, 'line' => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null, 'function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
] ]
@ -72,13 +66,4 @@ class FriendicaProcessor implements ProcessorInterface
return $record; return $record;
} }
private function isSkippedFunction(array $trace, $index)
{
if (!isset($trace[$index])) {
return false;
}
return in_array($trace[$index]['function'], $this->skipFunctions);
}
} }