diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-04-10 11:33:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-10 11:33:58 +0300 |
| commit | 90f72c0a44f940e8840115ee03cffe71bd0bce2e (patch) | |
| tree | 8a50d23b4b9515559416dfd8e8b3ca66a9e1e144 /lib | |
| parent | 3560a7872a3653a627769e4f7b96d4cd7010cc30 (diff) | |
| parent | 0fb197922278f7e89a2466dfb34e45af141e3098 (diff) | |
Merge pull request #465 from nextcloud/bugfix/fix-logging
Use error instead of exception template
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/DocumentController.php | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index b4c4d44c..1ba3abbf 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -133,17 +133,9 @@ class DocumentController extends Controller { } catch (\Exception $e) { $this->logger->logException($e, ['app'=>'richdocuments']); $params = [ - 'remoteAddr' => $this->request->getRemoteAddress(), - 'requestID' => $this->request->getId(), - 'debugMode' => $this->settings->getSystemValue('debug'), - 'errorClass' => get_class($e), - 'errorCode' => $e->getCode(), - 'errorMsg' => $e->getMessage(), - 'file' => $e->getFile(), - 'line' => $e->getLine(), - 'trace' => $e->getTraceAsString() + 'errors' => [['error' => $e->getMessage()]] ]; - return new TemplateResponse('core', 'exception', $params, 'guest'); + return new TemplateResponse('core', 'error', $params, 'guest'); } } @@ -213,17 +205,9 @@ class DocumentController extends Controller { } catch (\Exception $e) { $this->logger->logException($e, ['app'=>'richdocuments']); $params = [ - 'remoteAddr' => $this->request->getRemoteAddress(), - 'requestID' => $this->request->getId(), - 'debugMode' => $this->settings->getSystemValue('debug'), - 'errorClass' => get_class($e), - 'errorCode' => $e->getCode(), - 'errorMsg' => $e->getMessage(), - 'file' => $e->getFile(), - 'line' => $e->getLine(), - 'trace' => $e->getTraceAsString() + 'errors' => [['error' => $e->getMessage()]] ]; - return new TemplateResponse('core', 'exception', $params, 'guest'); + return new TemplateResponse('core', 'error', $params, 'guest'); } return new TemplateResponse('core', '403', [], 'guest'); @@ -326,17 +310,9 @@ class DocumentController extends Controller { } catch (\Exception $e) { $this->logger->logException($e, ['app'=>'richdocuments']); $params = [ - 'remoteAddr' => $this->request->getRemoteAddress(), - 'requestID' => $this->request->getId(), - 'debugMode' => $this->settings->getSystemValue('debug'), - 'errorClass' => get_class($e), - 'errorCode' => $e->getCode(), - 'errorMsg' => $e->getMessage(), - 'file' => $e->getFile(), - 'line' => $e->getLine(), - 'trace' => $e->getTraceAsString() + 'errors' => [['error' => $e->getMessage()]] ]; - return new TemplateResponse('core', 'exception', $params, 'guest'); + return new TemplateResponse('core', 'error', $params, 'guest'); } return new TemplateResponse('core', '403', [], 'guest'); |