diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2020-11-04 07:52:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 07:52:00 +0300 |
commit | 6b12f37eb630d25dffa13e315b894abda80ed5af (patch) | |
tree | cadb29189f71915124cffb350e9b6fbf786825dc /plugins/API | |
parent | 0739af50f6bf35a747e110a2f1178e17e8c21fa2 (diff) |
require PIWIK_PRINT_ERROR_BACKTRACE for exception backtraces in logs (#16640)
* require PIWIK_PRINT_ERROR_BACKTRACE for exception backtraces in logs
* consolidate uses of getTraceAsString to use single method where possible which always checks if should print stacktrace
* replace sensitive values and add some tests
* apply more review comments
* another tweak
* remove backtrace omitted error
* fix test
* fix test for travis
* fix test
Diffstat (limited to 'plugins/API')
-rw-r--r-- | plugins/API/Renderer/Json.php | 3 | ||||
-rw-r--r-- | plugins/API/Renderer/Original.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/API/Renderer/Json.php b/plugins/API/Renderer/Json.php index a8547b9226..5531c94537 100644 --- a/plugins/API/Renderer/Json.php +++ b/plugins/API/Renderer/Json.php @@ -12,6 +12,7 @@ use Piwik\API\ApiRenderer; use Piwik\Common; use Piwik\DataTable\Renderer; use Piwik\Piwik; +use Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor; use Piwik\ProxyHttp; /** @@ -37,7 +38,7 @@ class Json extends ApiRenderer $data = array('result' => 'error', 'message' => $exceptionMessage); if ($this->shouldSendBacktrace()) { - $data['backtrace'] = $exception->getTraceAsString(); + $data['backtrace'] = ExceptionToTextProcessor::getMessageAndWholeBacktrace($exception, true); } $result = json_encode($data); diff --git a/plugins/API/Renderer/Original.php b/plugins/API/Renderer/Original.php index a473278929..637b134183 100644 --- a/plugins/API/Renderer/Original.php +++ b/plugins/API/Renderer/Original.php @@ -12,6 +12,7 @@ use Piwik\API\ApiRenderer; use Piwik\Common; use Piwik\DataTable; use Piwik\DataTable\DataTableInterface; +use Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor; class Original extends ApiRenderer { @@ -40,7 +41,7 @@ class Original extends ApiRenderer ]; if ($this->shouldSendBacktrace()) { - $data['backtrace'] = $exception->getTraceAsString(); + $data['backtrace'] = ExceptionToTextProcessor::getMessageAndWholeBacktrace($exception, true); } return serialize($data); |