Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-08 00:22:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1994 from kounoike/pr-show-email-settings-error

Browse Source 
Show SMTP Error message in testing email settings
This commit is contained in:
Naoki Takezoe
2018-05-02 16:50:56 +09:00
committed by GitHub
parent b9acfc62c6 1a90fd86ff
commit 227e2786e1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
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,7 +313,8 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
"Test mail has been sent to: " + form.testAddress
} catch {
case e: Exception => "[Error] " + e.toString
case e: EmailException => s"[Error] ${e.getCause}"
case e: Exception => "[Error] " + e.toString
}
})