bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

improving code

Browse source
This commit is contained in:
Philipp Holzer 2019-01-28 18:26:35 +01:00
parent 9fe1da5f94
commit 26af96f31a
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Util/Logger/FriendicaProcessor.php
View file

@ -48,19 +48,7 @@ class FriendicaProcessor implements ProcessorInterface
$i = 1; $i = 1;
while ($this->isTraceClassOrSkippedFunction($trace, $i)) { while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
if (isset($trace[$i]['class'])) { $i++;
foreach ($this->skipClassesPartials as $part) {
if (strpos($trace[$i]['class'], $part) !== false) {
$i++;
continue 2;
}
}
} elseif (in_array($trace[$i]['function'], $this->skipFunctions)) {
$i++;
continue;
}
break;
} }
$i += $this->skipStackFramesCount; $i += $this->skipStackFramesCount;
@ -78,12 +66,29 @@ class FriendicaProcessor implements ProcessorInterface
return $record; return $record;
} }
/**
* Checks if the current trace class or function has to be skipped
*
* @param array $trace The current trace array
* @param int $index The index of the current hierarchy level
* @return bool True if the class or function should get skipped, otherwise false
*/
private function isTraceClassOrSkippedFunction(array $trace, $index) private function isTraceClassOrSkippedFunction(array $trace, $index)
{ {
if (!isset($trace[$index])) { if (!isset($trace[$index])) {
return false; return false;
} }
return isset($trace[$index]['class']) || in_array($trace[$index]['function'], $this->skipFunctions); if (isset($trace[$index]['class'])) {
foreach ($this->skipClassesPartials as $part) {
if (strpos($trace[$index]['class'], $part) !== false) {
return true;
}
}
} elseif (in_array($trace[$index]['function'], $this->skipFunctions)) {
return true;
}
return false;
} }
} }