From 49f095bb26dbd069aa65d081733f1c8d4bf382c5 Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Wed, 2 May 2018 13:55:16 +0900 Subject: [PATCH] Show SMTP Error message in testing email settings --- .../gitbucket/core/controller/SystemSettingsController.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index 513affc81..223f9d963 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -15,6 +15,7 @@ import gitbucket.core.util.StringUtil._ import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util.{AdminAuthenticator, Mailer} import org.apache.commons.io.IOUtils +import org.apache.commons.mail.EmailException import org.json4s.jackson.Serialization import org.scalatra._ import org.scalatra.forms._ @@ -312,6 +313,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase { "Test mail has been sent to: " + form.testAddress } catch { + case e: EmailException => s"[Error] ${e.getCause}" case e: Exception => "[Error] " + e.toString } })