Skip to content

Back-trace filtering improvements #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric-martin merged 2 commits into from
Mar 26, 2015
Merged

Back-trace filtering improvements #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15360d6
In some cases file and line may be undefined in stack-trace
Mar 25, 2015
10b6cee
Do not exclude trace items that do not contain file path
Mar 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/Stackify/Log/Entities/ErrorWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class ErrorWrapper
private $sourceMethod;

const TYPE_STRING_EXCEPTION = 'StringException';
const UNKNOWN_METHOD = '{unknown}';
const TRACE_UNKNOWN_ITEM = '{unknown}';

/**
* @var \Stackify\Log\Entities\ErrorWrapper
Expand Down Expand Up @@ -89,19 +89,23 @@ private function setTrace(array $trace)
if (isset($item['function'])) {
$function = $item['function'] . '()';
} else {
$function = self::UNKNOWN_METHOD;
$function = self::TRACE_UNKNOWN_ITEM;
}
if (isset($item['class'])) {
// type is -> or :: which means dynamic or static method call
$type = isset($item['type']) ? $item['type'] : '->';
$type = $this->getTraceItem($item, 'type', '->');
$function = $item['class'] . $type . $function;
$sourceMethod = $function;
} else {
$sourceMethod = $item['file'] . ':' . $function;
if (isset($item['file'])) {
$sourceMethod = $item['file'] . ':' . $function;
} else {
$sourceMethod = $function;
}
}
$result[] = array(
'file' => $item['file'],
'line' => $item['line'],
'file' => $this->getTraceItem($item, 'file', self::TRACE_UNKNOWN_ITEM),
'line' => $this->getTraceItem($item, 'line', 0),
'function' => $function,
);
if (0 === $index) {
Expand All @@ -111,6 +115,11 @@ private function setTrace(array $trace)
$this->trace = $result;
}

private function getTraceItem($item, $keyName, $defaulValue = null)
{
return isset($item[$keyName]) ? $item[$keyName] : $defaulValue;
}

private function filterTrace(array $trace)
{
$filtered = array();
Expand All @@ -123,7 +132,7 @@ private function filterTrace(array $trace)
}
foreach ($trace as $item) {
// check if path starts with $excludePath
if (isset($item['file']) && false === strpos($item['file'], $excludePath)) {
if (!isset($item['file']) || false === strpos($item['file'], $excludePath)) {
$filtered[] = $item;
}
}
Expand Down