diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index dd919b5dab..fd802a0fb6 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -72,6 +72,7 @@ class Handler extends ExceptionHandler $data = [ 'class' => get_class($exception), 'errorMessage' => $exception->getMessage(), + 'time' => date('r'), 'stackTrace' => $exception->getTraceAsString(), 'file' => $exception->getFile(), 'line' => $exception->getLine(), diff --git a/config/queue.php b/config/queue.php index 6c2b7d2e17..5340b92a9d 100644 --- a/config/queue.php +++ b/config/queue.php @@ -45,7 +45,7 @@ return [ 'beanstalkd' => [ 'driver' => 'beanstalkd', 'host' => 'localhost', - 'queue' => 'default', + 'queue' => 'firefly', 'ttr' => 60, ], diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index 828d354812..778f5eac56 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -6,8 +6,17 @@

- Firefly III ran into an error: {{ errorMessage }} of class (type) "{{ class }}". + Firefly III ran into an error: {{ errorMessage }}

+ +

+The error was of type "{{ class }}". +

+ +

+The error occured on/at: {{ time }}. +

+

This error occured in file {{ file }} on line {{ line }} with code {{ code }}.

diff --git a/resources/views/emails/error.twig b/resources/views/emails/error.twig index cea37a1d82..369894a1c2 100644 --- a/resources/views/emails/error.twig +++ b/resources/views/emails/error.twig @@ -1,4 +1,8 @@ -Firefly III ran into an error: {{ errorMessage }} of class (type) "{{ class }}". +Firefly III ran into an error: {{ errorMessage }}. + +The error was of type "{{ class }}". + +The error occured on/at: {{ time }}. This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}.