summaryrefslogtreecommitdiffstats
path: root/app/admin.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2018-04-12 11:36:56 -0400
committerGitHub <noreply@github.com>2018-04-12 11:36:56 -0400
commit191e1ad5563aada1c282e43eb6fa043e317290c8 (patch)
tree199ea55e303e40e360d8182c2e6e238800f68c24 /app/admin.go
parent1ebf19825bc735424f7278a3c749f83d24ab80f1 (diff)
downloadchat-191e1ad5563aada1c282e43eb6fa043e317290c8.tar.gz
chat-191e1ad5563aada1c282e43eb6fa043e317290c8.tar.bz2
chat-191e1ad5563aada1c282e43eb6fa043e317290c8.zip
MM-8180 Improve error message for testing smtp connections (#8608)
* Improve error message for testing smtp connections * Update error message
Diffstat (limited to 'app/admin.go')
-rw-r--r--app/admin.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/admin.go b/app/admin.go
index 299a8f057..60b71505a 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -243,7 +243,7 @@ func (a *App) TestEmail(userId string, cfg *model.Config) *model.AppError {
T := utils.GetUserTranslations(user.Locale)
license := a.License()
if err := utils.SendMailUsingConfig(user.Email, T("api.admin.test_email.subject"), T("api.admin.test_email.body"), cfg, license != nil && *license.Features.Compliance); err != nil {
- return err
+ return model.NewAppError("testEmail", "app.admin.test_email.failure", map[string]interface{}{"Error": err.Error()}, "", http.StatusInternalServerError)
}
}