catch error on call setup on serv command (#932)

lunny · web-flow · commit be55460b63dd · 2017-02-15T09:25:21.000+08:00
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -47,7 +47,7 @@ var CmdServ = cli.Command{
 	},
 }
 
-func setup(logPath string) {
+func setup(logPath string) error {
 	setting.NewContext()
 	log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))
 
@@ -60,7 +60,7 @@ func setup(logPath string) {
 		}
 	}
 
-	models.SetEngine()
+	return models.SetEngine()
 }
 
 func parseCmd(cmd string) (string, string) {
@@ -146,7 +146,9 @@ func runServ(c *cli.Context) error {
 		setting.CustomConf = c.String("config")
 	}
 
-	setup("serv.log")
+	if err := setup("serv.log"); err != nil {
+		fail("System init failed", fmt.Sprintf("setup: %v", err))
+	}
 
 	if setting.SSH.Disabled {
 		println("Gitea: SSH has been disabled")

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ var CmdServ = cli.Command{`
`47`	`47`	`},`
`48`	`48`	`}`
`49`	`49`
`50`		`-func setup(logPath string) {`
	`50`	`+func setup(logPath string) error {`
`51`	`51`	`setting.NewContext()`
`52`	`52`	`log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))`
`53`	`53`
`@@ -60,7 +60,7 @@ func setup(logPath string) {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- models.SetEngine()`
	`63`	`+ return models.SetEngine()`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func parseCmd(cmd string) (string, string) {`
`@@ -146,7 +146,9 @@ func runServ(c *cli.Context) error {`
`146`	`146`	`setting.CustomConf = c.String("config")`
`147`	`147`	`}`
`148`	`148`
`149`		`- setup("serv.log")`
	`149`	`+ if err := setup("serv.log"); err != nil {`
	`150`	`+ fail("System init failed", fmt.Sprintf("setup: %v", err))`
	`151`	`+ }`
`150`	`152`
`151`	`153`	`if setting.SSH.Disabled {`
`152`	`154`	`println("Gitea: SSH has been disabled")`