From 377a0a20f01a62f15a1504a3bba6cf6cc0c98bea Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 4 May 2023 11:55:35 +0800
Subject: Merge setting.InitXXX into one function with options (#24389)

This PR will merge 3 Init functions on setting packages as 1 and
introduce an options struct.
---
 cmd/actions.go      | 3 +--
 cmd/cmd.go          | 3 +--
 cmd/doctor.go       | 3 +--
 cmd/dump.go         | 3 +--
 cmd/embedded.go     | 5 +++--
 cmd/mailer.go       | 3 +--
 cmd/main_test.go    | 6 ------
 cmd/restore_repo.go | 3 +--
 cmd/serv.go         | 3 +--
 cmd/web.go          | 3 +--
 10 files changed, 11 insertions(+), 24 deletions(-)

(limited to 'cmd')

diff --git a/cmd/actions.go b/cmd/actions.go
index 66ad336da5..346de5b21a 100644
--- a/cmd/actions.go
+++ b/cmd/actions.go
@@ -42,8 +42,7 @@ func runGenerateActionsRunnerToken(c *cli.Context) error {
 	ctx, cancel := installSignals()
 	defer cancel()
 
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 
 	scope := c.String("scope")
 
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 18d5db3987..cf2d9ef89e 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -57,8 +57,7 @@ func confirm() (bool, error) {
 }
 
 func initDB(ctx context.Context) error {
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 	setting.LoadDBSetting()
 	setting.InitSQLLog(false)
 
diff --git a/cmd/doctor.go b/cmd/doctor.go
index e7baad60c1..65c028c5ed 100644
--- a/cmd/doctor.go
+++ b/cmd/doctor.go
@@ -87,8 +87,7 @@ func runRecreateTable(ctx *cli.Context) error {
 	golog.SetPrefix("")
 	golog.SetOutput(log.NewLoggerAsWriter("INFO", log.GetLogger(log.DEFAULT)))
 
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 	setting.LoadDBSetting()
 
 	setting.Log.EnableXORMLog = ctx.Bool("debug")
diff --git a/cmd/dump.go b/cmd/dump.go
index 309bd01f66..32ccc5566c 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -185,8 +185,7 @@ func runDump(ctx *cli.Context) error {
 		}
 		fileName += "." + outType
 	}
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 
 	// make sure we are logging to the console no matter what the configuration tells us do to
 	// FIXME: don't use CfgProvider directly
diff --git a/cmd/embedded.go b/cmd/embedded.go
index cee8928ce0..3f849bea0a 100644
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -106,8 +106,9 @@ func initEmbeddedExtractor(c *cli.Context) error {
 	log.DelNamedLogger(log.DEFAULT)
 
 	// Read configuration file
-	setting.InitProviderAllowEmpty()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{
+		AllowEmpty: true,
+	})
 
 	patterns, err := compileCollectPatterns(c.Args())
 	if err != nil {
diff --git a/cmd/mailer.go b/cmd/mailer.go
index 50ba4b4741..74bae1ab68 100644
--- a/cmd/mailer.go
+++ b/cmd/mailer.go
@@ -16,8 +16,7 @@ func runSendMail(c *cli.Context) error {
 	ctx, cancel := installSignals()
 	defer cancel()
 
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 
 	if err := argsSet(c, "title"); err != nil {
 		return err
diff --git a/cmd/main_test.go b/cmd/main_test.go
index ba323af472..6e20be6945 100644
--- a/cmd/main_test.go
+++ b/cmd/main_test.go
@@ -7,14 +7,8 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
-	"code.gitea.io/gitea/modules/setting"
 )
 
-func init() {
-	setting.SetCustomPathAndConf("", "", "")
-	setting.InitProviderAndLoadCommonSettingsForTest()
-}
-
 func TestMain(m *testing.M) {
 	unittest.MainTest(m, &unittest.TestOptions{
 		GiteaRootPath: "..",
diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go
index 887b59bba9..5a7ede4939 100644
--- a/cmd/restore_repo.go
+++ b/cmd/restore_repo.go
@@ -51,8 +51,7 @@ func runRestoreRepository(c *cli.Context) error {
 	ctx, cancel := installSignals()
 	defer cancel()
 
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 	var units []string
 	if s := c.String("units"); s != "" {
 		units = strings.Split(s, ",")
diff --git a/cmd/serv.go b/cmd/serv.go
index 72eb637071..a79f314d00 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -62,8 +62,7 @@ func setup(ctx context.Context, debug bool) {
 	} else {
 		_ = log.NewLogger(1000, "console", "console", `{"level":"fatal","stacktracelevel":"NONE","stderr":true}`)
 	}
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 	if debug {
 		setting.RunMode = "dev"
 	}
diff --git a/cmd/web.go b/cmd/web.go
index e451cf7dfa..3a01d07b05 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -177,8 +177,7 @@ func runWeb(ctx *cli.Context) error {
 
 	log.Info("Global init")
 	// Perform global initialization
-	setting.InitProviderFromExistingFile()
-	setting.LoadCommonSettings()
+	setting.Init(&setting.Options{})
 	routers.GlobalInitInstalled(graceful.GetManager().HammerContext())
 
 	// We check that AppDataPath exists here (it should have been created during installation)
-- 
cgit v1.2.3