kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Use a job to send the error email instead of inline. #196

Browse Source
This commit is contained in:
James Cole
2016-02-24 20:13:55 +01:00
parent ecefcfabc0
commit 91eb052c22
4 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Exceptions/Handler.php
View File

@@ -5,14 +5,12 @@ namespace FireflyIII\Exceptions;
use Auth;
use ErrorException;
use Exception;
use FireflyIII\Jobs\MailError;
use FireflyIII\User;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Mail\Message;
use Log;
use Mail;
use Request;
use Swift_TransportException;
use Symfony\Component\HttpKernel\Exception\HttpException;
/**
@@ -69,34 +67,20 @@ class Handler extends ExceptionHandler
if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
// mail?
try {
$email = env('SITE_OWNER');
$user = Auth::user();
$args = [
'errorMessage' => $exception->getMessage(),
'stacktrace' => $exception->getTraceAsString(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
'code' => $exception->getCode(),
'loggedIn' => !is_null($user),
'user' => $user,
'ip' => Request::ip(),
$user = Auth::check() ? Auth::user() : new User;
];
$data = [
'class' => get_class($exception),
'errorMessage' => $exception->getMessage(),
'stackTrace' => $exception->getTraceAsString(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
'code' => $exception->getCode(),
];
Mail::send(
['emails.error-html', 'emails.error'], $args,
function (Message $message) use ($email) {
if ($email != 'mail@example.com') {
$message->to($email, $email)->subject('Caught an error in Firely III.');
}
}
);
} catch (Swift_TransportException $e) {
// could also not mail! :o
Log::error($e->getMessage());
}
// create job that will mail.
$job = new MailError($user, env('SITE_OWNER'), Request::ip(), $data);
dispatch($job);
}
parent::report($exception);