worldcone/forgejo
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Lunny Xiao 2017-02-15 09:25:21 +08:00 committed by GitHub
parent 9c645b54dc
commit be55460b63
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/serve.go
View file

@ -47,7 +47,7 @@ var CmdServ = cli.Command{
}, },
} }
func setup(logPath string) { func setup(logPath string) error {
setting.NewContext() setting.NewContext()
log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath)) 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) { func parseCmd(cmd string) (string, string) {
@ -146,7 +146,9 @@ func runServ(c *cli.Context) error {
setting.CustomConf = c.String("config") 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 { if setting.SSH.Disabled {
println("Gitea: SSH has been disabled") println("Gitea: SSH has been disabled")