Skip to content

Commit 1fdd834

Browse files
lunnyearl-warren
authored andcommitted
[gitea] Remove unnecessary parameter (go-gitea#29092)
The parameter extraConfigs has never been used anywhere. This PR just removed it. It can be taken back once it's needed. (cherry picked from commit 8c6ffda)
1 parent 02b0324 commit 1fdd834

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

models/unittest/testdb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ func fatalTestError(fmtStr string, args ...any) {
4444
}
4545

4646
// InitSettings initializes config provider and load common settings for tests
47-
func InitSettings(extraConfigs ...string) {
47+
func InitSettings() {
4848
if setting.CustomConf == "" {
4949
setting.CustomConf = filepath.Join(setting.CustomPath, "conf/app-unittest-tmp.ini")
5050
_ = os.Remove(setting.CustomConf)
5151
}
52-
setting.InitCfgProvider(setting.CustomConf, strings.Join(extraConfigs, "\n"))
52+
setting.InitCfgProvider(setting.CustomConf)
5353
setting.LoadCommonSettings()
5454

5555
if err := setting.PrepareAppDataPath(); err != nil {

modules/setting/config_provider.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func NewConfigProviderFromData(configContent string) (ConfigProvider, error) {
197197

198198
// NewConfigProviderFromFile load configuration from file.
199199
// NOTE: do not print any log except error.
200-
func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvider, error) {
200+
func NewConfigProviderFromFile(file string) (ConfigProvider, error) {
201201
cfg := ini.Empty(configProviderLoadOptions())
202202
loadedFromEmpty := true
203203

@@ -214,12 +214,6 @@ func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvi
214214
}
215215
}
216216

217-
for _, s := range extraConfigs {
218-
if err := cfg.Append([]byte(s)); err != nil {
219-
return nil, fmt.Errorf("unable to append more config: %v", err)
220-
}
221-
}
222-
223217
cfg.NameMapper = ini.SnackCase
224218
return &iniConfigProvider{
225219
file: file,

modules/setting/setting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ func PrepareAppDataPath() error {
9292
return nil
9393
}
9494

95-
func InitCfgProvider(file string, extraConfigs ...string) {
95+
func InitCfgProvider(file string) {
9696
var err error
97-
if CfgProvider, err = NewConfigProviderFromFile(file, extraConfigs...); err != nil {
97+
if CfgProvider, err = NewConfigProviderFromFile(file); err != nil {
9898
log.Fatal("Unable to init config provider from %q: %v", file, err)
9999
}
100100
CfgProvider.DisableSaving() // do not allow saving the CfgProvider into file, it will be polluted by the "MustXxx" calls

0 commit comments

Comments
 (0)