MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [internal] SendEmail exceptions message and logging

pull/5240/head
Jakub Onderka 2020-04-26 21:44:22 +02:00
parent 65a4ece3bb
commit 6fc8e4d119
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Lib/Tools/SendEmail.php
View File

@ -316,7 +316,7 @@ class SendEmail
try {
$result = $email->send();
} catch (Exception $e) {
throw new SendEmailException("The message could be sent.", 0, $e);
throw new SendEmailException("The message could not be sent.", 0, $e);
}
if ($result && !$mock) {
@ -416,7 +416,7 @@ class SendEmail
$email->send();
return $encrypted;
} catch (Exception $e) {
throw new SendEmailException("The message could be sent.", 0, $e);
throw new SendEmailException("The message could not be sent.", 0, $e);
}
}

2
app/Model/AppModel.php
View File

@ -2853,6 +2853,8 @@ class AppModel extends Model
}
/**
* Log exception with backtrace and with nested exceptions.
*
* @param string $message
* @param Exception $exception
* @param int $type