summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2019-07-02 11:53:50 +0200
committerGitHub <noreply@github.com>2019-07-02 11:53:50 +0200
commit23bcb715ebedb60c538511d5f307a39f56a71a34 (patch)
tree6c57d70db4a12beed97d096f7d2855bfaccd57d6 /apps
parent9f7fca49bbeb13104457d9f74645d3715f98789f (diff)
parent33409319be610dfa525e27a9d3ebf124f89fc030 (diff)
downloadnextcloud-server-23bcb715ebedb60c538511d5f307a39f56a71a34.tar.gz
nextcloud-server-23bcb715ebedb60c538511d5f307a39f56a71a34.zip
Do not fail hard on new user mail error (#16183)
Do not fail hard on new user mail error
Diffstat (limited to 'apps')
-rw-r--r--apps/provisioning_api/lib/Controller/UsersController.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index 93b5d62db36..1fa1f1fa5b3 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -328,12 +328,13 @@ class UsersController extends AUserData {
$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
} catch (\Exception $e) {
+ // Mail could be failing hard or just be plain not configured
+ // Logging error as it is the hardest of the two
$this->logger->logException($e, [
- 'message' => "Can't send new user mail to $email",
+ 'message' => "Unable to send the invitation mail to $email",
'level' => ILogger::ERROR,
'app' => 'ocs_api',
]);
- throw new OCSException('Unable to send the invitation mail', 109);
}
}