summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-09-16 23:08:46 -0400
committerUnknwon <u@gogs.io>2015-09-16 23:08:46 -0400
commite75fd2f783a413ae612e3e6110c912b3ecf9555d (patch)
tree969e7fc034c60db60695780b75815bbba17db7e8 /cmd
parenta517cfdf7b24514d7c1f6695dc175ce18c832465 (diff)
downloadgitea-e75fd2f783a413ae612e3e6110c912b3ecf9555d.tar.gz
gitea-e75fd2f783a413ae612e3e6110c912b3ecf9555d.zip
simplify names
Diffstat (limited to 'cmd')
-rw-r--r--cmd/dump.go4
-rw-r--r--cmd/serve.go6
2 files changed, 5 insertions, 5 deletions
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)
}