Show SMTP Error message in testing email settings

This commit is contained in:
KOUNOIKE Yuusuke
2018-05-02 13:55:16 +09:00
parent 173669f75e
commit 49f095bb26

View File

@@ -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
}
})