From 5efbde4fe92cf30799c3c9fd66251dfbc03c4d87 Mon Sep 17 00:00:00 2001
From: ᴜɴᴋɴᴡᴏɴ <u@gogs.io>
Date: Sat, 22 Feb 2020 18:58:16 +0800
Subject: conf: overhaul database settings

---
 internal/cmd/admin.go   | 2 --
 internal/cmd/backup.go  | 1 -
 internal/cmd/restore.go | 1 -
 internal/cmd/serv.go    | 2 --
 4 files changed, 6 deletions(-)

(limited to 'internal/cmd')

diff --git a/internal/cmd/admin.go b/internal/cmd/admin.go
index 19c31a54..e0f38a86 100644
--- a/internal/cmd/admin.go
+++ b/internal/cmd/admin.go
@@ -146,7 +146,6 @@ func runCreateUser(c *cli.Context) error {
 		return errors.Wrap(err, "init configuration")
 	}
 
-	db.LoadConfigs()
 	db.SetEngine()
 
 	if err := db.CreateUser(&db.User{
@@ -170,7 +169,6 @@ func adminDashboardOperation(operation func() error, successMessage string) func
 			return errors.Wrap(err, "init configuration")
 		}
 
-		db.LoadConfigs()
 		db.SetEngine()
 
 		if err := operation(); err != nil {
diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go
index 035b68af..c4435e1a 100644
--- a/internal/cmd/backup.go
+++ b/internal/cmd/backup.go
@@ -52,7 +52,6 @@ func runBackup(c *cli.Context) error {
 		return errors.Wrap(err, "init configuration")
 	}
 
-	db.LoadConfigs()
 	db.SetEngine()
 
 	tmpDir := c.String("tempdir")
diff --git a/internal/cmd/restore.go b/internal/cmd/restore.go
index f1f2c99f..35cabea9 100644
--- a/internal/cmd/restore.go
+++ b/internal/cmd/restore.go
@@ -99,7 +99,6 @@ func runRestore(c *cli.Context) error {
 		return errors.Wrap(err, "init configuration")
 	}
 
-	db.LoadConfigs()
 	db.SetEngine()
 
 	// Database
diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go
index 5076520c..567f4572 100644
--- a/internal/cmd/serv.go
+++ b/internal/cmd/serv.go
@@ -84,8 +84,6 @@ func setup(c *cli.Context, logPath string, connectDB bool) {
 		return
 	}
 
-	db.LoadConfigs()
-
 	if conf.UseSQLite3 {
 		_ = os.Chdir(conf.WorkDir())
 	}
-- 
cgit v1.2.3