mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle mail send error gracefully 

log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2018-11-23 16:53:32 +01:00 committed by Christoph Wurst
parent 29a5661614
commit a94358062d
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/private/Share20/Manager.php
View File

@ -714,7 +714,7 @@ class Manager implements IManager {
* @param string $initiator user ID of share sender
* @param string $shareWith email address of share receiver
* @param \DateTime|null $expiration
* @throws \Exception If mail couldn't be sent
* @return bool
*/
protected function sendMailNotification(IL10N $l,
$filename,
@ -773,7 +773,18 @@ class Manager implements IManager {
}
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
try {
$failedRecipients = $this->mailer->send($message);
if(!empty($failedRecipients)) {
$this->logger->error('Share notification mail could not be send to: ' . implode(', ', $failedRecipients));
return false;
}
} catch (\Exception $e) {
$this->logger->error('Share notification mail could not be send: ' . $e->getMessage());
return false;
}
return true;
}
/**