From be55460b63dd441f4b3879fdaafa2385927cd59c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 15 Feb 2017 09:25:21 +0800 Subject: [PATCH] catch error on call setup on serv command (#932) --- cmd/serve.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 73b9dddd6312..c69254e3f5d3 100644 --- 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")