mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show the full trace of an exception 

Because often we catch the exception at some point and then the trace is
misleading. What's really interesting is the trace of the *previous*
exception.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-11-10 10:18:33 +01:00
parent 78e1f22893
commit 979b291a36
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/templates/exception.php
View File

@ -1,8 +1,24 @@
<?php <?php
/** @var array $_ */ /** @var array $_ */
/** @var \OCP\IL10N $l */ /** @var \OCP\IL10N $l */
style('core', ['styles', 'header']); style('core', ['styles', 'header']);
function print_exception(Throwable $e, \OCP\IL10N $l): void {
print_unescaped('<pre>');
p($e->getTraceAsString());
print_unescaped('</pre>');
if ($e->getPrevious() !== null) {
print_unescaped('<br />');
print_unescaped('<h4>');
p($l->t('Previous'));
print_unescaped('</h4>');
print_exception($e->getPrevious(), $l);
}
}
?> ?>
<div class="error error-wide"> <div class="error error-wide">
<h2><?php p($l->t('Internal Server Error')) ?></h2> <h2><?php p($l->t('Internal Server Error')) ?></h2>
@ -26,6 +42,6 @@ style('core', ['styles', 'header']);
<?php if (isset($_['debugMode']) && $_['debugMode'] === true): ?> <?php if (isset($_['debugMode']) && $_['debugMode'] === true): ?>
<br /> <br />
<h3><?php p($l->t('Trace')) ?></h3> <h3><?php p($l->t('Trace')) ?></h3>
<pre><?php p($_['trace']) ?></pre> <?php print_exception($_['exception'], $l); ?>
<?php endif; ?> <?php endif; ?>
</div> </div>

3
lib/private/Template/Base.php
View File

@ -31,6 +31,7 @@
namespace OC\Template; namespace OC\Template;
use OCP\Defaults; use OCP\Defaults;
use Throwable;
class Base { class Base {
private $template; // The template private $template; // The template
@ -92,7 +93,7 @@ class Base {
/** /**
* Assign variables * Assign variables
* @param string $key key * @param string $key key
* @param array|bool|integer|string $value value * @param array|bool|integer|string|Throwable $value value
* @return bool * @return bool
* *
* This function assigns a variable. It can be accessed via $_[$key] in * This function assigns a variable. It can be accessed via $_[$key] in

2
lib/private/legacy/OC_Template.php
View File

@ -325,7 +325,7 @@ class OC_Template extends \OC\Template\Base {
$content->assign('errorCode', $exception->getCode()); $content->assign('errorCode', $exception->getCode());
$content->assign('file', $exception->getFile()); $content->assign('file', $exception->getFile());
$content->assign('line', $exception->getLine()); $content->assign('line', $exception->getLine());
$content->assign('trace', $exception->getTraceAsString()); $content->assign('exception', $exception);
$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false)); $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
$content->assign('remoteAddr', $request->getRemoteAddress()); $content->assign('remoteAddr', $request->getRemoteAddress());
$content->assign('requestID', $request->getId()); $content->assign('requestID', $request->getId());