summaryrefslogtreecommitdiffstats
path: root/lib/private/Log.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-09-26 11:21:39 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-09-26 13:54:51 +0200
commit11c31e94fe6afaaba7c94a009cc931a5515d77a1 (patch)
treec5fe873526d1be62a94d207df342a6d5d242552a /lib/private/Log.php
parentef3e8faea22a3a7278dbf24f3988c80d80415090 (diff)
downloadnextcloud-server-11c31e94fe6afaaba7c94a009cc931a5515d77a1.tar.gz
nextcloud-server-11c31e94fe6afaaba7c94a009cc931a5515d77a1.zip
Improve exception handling
If there is an exception in the template handling then a white page is shown. This improves the handling of this and shows text only about the internal error. To test this just setup redis as cache and then disable the php-redis module. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Log.php')
-rw-r--r--lib/private/Log.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Log.php b/lib/private/Log.php
index d93b29414e6..39577d2387a 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -331,6 +331,9 @@ class Log implements ILogger {
'Line' => $exception->getLine(),
);
$data['Trace'] = preg_replace('!(' . implode('|', $this->methodsWithSensitiveParameters) . ')\(.*\)!', '$1(*** sensitive parameters replaced ***)', $data['Trace']);
+ if ($exception instanceof HintException) {
+ $data['Hint'] = $exception->getHint();
+ }
$msg = isset($context['message']) ? $context['message'] : 'Exception';
$msg .= ': ' . json_encode($data);
$this->log($level, $msg, $context);