Merge pull request #7129 from firefly-iii/common-mail-errors

Catch common mail errors
This commit is contained in:
James Cole
2023-03-04 22:26:43 +01:00
committed by GitHub

View File

@@ -91,6 +91,15 @@ class MailError extends Job implements ShouldQueue
}
);
} catch (Exception $e) { // intentional generic exception
$message = $e->getMessage();
if (str_contains($message, 'Bcc')) {
Log::warning('[Bcc] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.');
return;
}
if (str_contains($message, 'RFC 2822')) {
Log::warning('[RFC] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.');
return;
}
throw new FireflyException($e->getMessage(), 0, $e);
}
}