From e75fd2f783a413ae612e3e6110c912b3ecf9555d Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 16 Sep 2015 23:08:46 -0400 Subject: simplify names --- cmd/dump.go | 4 ++-- cmd/serve.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/dump.go b/cmd/dump.go index 36bb4f0305..44b180c32b 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -34,8 +34,8 @@ func runDump(ctx *cli.Context) { if ctx.IsSet("config") { setting.CustomConf = ctx.String("config") } - setting.NewConfigContext() - models.LoadModelsConfig() + setting.NewContext() + models.LoadConfigs() models.SetEngine() log.Printf("Dumping local repositories...%s", setting.RepoRootPath) diff --git a/cmd/serve.go b/cmd/serve.go index ec1da3beef..57677704c6 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -37,7 +37,7 @@ var CmdServ = cli.Command{ } func setup(logPath string) { - setting.NewConfigContext() + setting.NewContext() log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath)) if setting.DisableSSH { @@ -45,9 +45,9 @@ func setup(logPath string) { os.Exit(1) } - models.LoadModelsConfig() + models.LoadConfigs() - if setting.UseSQLite3 { + if setting.UseSQLite3 || setting.UseTiDB { workDir, _ := setting.WorkDir() os.Chdir(workDir) } -- cgit v1.2.3