diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/cmd.go | 2 | ||||
| -rw-r--r-- | cmd/convert.go | 4 | ||||
| -rw-r--r-- | cmd/dump.go | 5 | ||||
| -rw-r--r-- | cmd/migrate.go | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cmd/cmd.go b/cmd/cmd.go index 5a55ac318c..d05eb8b1a2 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -38,7 +38,7 @@ func initDB() error { func initDBDisableConsole(disableConsole bool) error { setting.NewContext() - models.LoadConfigs() + setting.InitDBConfig() setting.NewXORMLogService(disableConsole) if err := models.SetEngine(); err != nil { diff --git a/cmd/convert.go b/cmd/convert.go index cb0510c722..23a3d8dbe9 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -31,9 +31,9 @@ func runConvert(ctx *cli.Context) error { log.Trace("AppWorkPath: %s", setting.AppWorkPath) log.Trace("Custom path: %s", setting.CustomPath) log.Trace("Log path: %s", setting.LogRootPath) - models.LoadConfigs() + setting.InitDBConfig() - if models.DbCfg.Type != "mysql" { + if !setting.Database.UseMySQL { fmt.Println("This command can only be used with a MySQL database") return nil } diff --git a/cmd/dump.go b/cmd/dump.go index de289270d4..1bf6901769 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -58,7 +58,6 @@ It can be used for backup and capture Gitea server image to send to maintainer`, func runDump(ctx *cli.Context) error { setting.NewContext() setting.NewServices() // cannot access session settings otherwise - models.LoadConfigs() err := models.SetEngine() if err != nil { @@ -104,8 +103,8 @@ func runDump(ctx *cli.Context) error { } targetDBType := ctx.String("database") - if len(targetDBType) > 0 && targetDBType != models.DbCfg.Type { - log.Printf("Dumping database %s => %s...", models.DbCfg.Type, targetDBType) + if len(targetDBType) > 0 && targetDBType != setting.Database.Type { + log.Printf("Dumping database %s => %s...", setting.Database.Type, targetDBType) } else { log.Printf("Dumping database...") } diff --git a/cmd/migrate.go b/cmd/migrate.go index dde50a455f..1fa1d09e25 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -30,7 +30,7 @@ func runMigrate(ctx *cli.Context) error { log.Trace("AppWorkPath: %s", setting.AppWorkPath) log.Trace("Custom path: %s", setting.CustomPath) log.Trace("Log path: %s", setting.LogRootPath) - models.LoadConfigs() + setting.InitDBConfig() if err := models.NewEngine(migrations.Migrate); err != nil { log.Fatal("Failed to initialize ORM engine: %v", err) |