blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

fix issue of failing configuration for default configuration file for package gcfg

Browse Source
This commit is contained in:
jflyfox 2021-02-26 13:57:47 +08:00
parent d330afdd36
commit eb6763b0fd
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/gcfg/gcfg.go
View File

@ -40,7 +40,7 @@ type Config struct {
} }
var ( var (
supportedFileTypes = []string{"toml", "yaml", "json", "ini", "xml"} supportedFileTypes = []string{"toml", "yaml", "yml", "json", "ini", "xml"}
resourceTryFiles = []string{"", "/", "config/", "config", "/config", "/config/"} resourceTryFiles = []string{"", "/", "config/", "config", "/config", "/config/"}
) )

13
os/gcfg/gcfg_instance.go
View File

@ -32,10 +32,15 @@ func Instance(name ...string) *Config {
} }
return instances.GetOrSetFuncLock(key, func() interface{} { return instances.GetOrSetFuncLock(key, func() interface{} {
c := New() c := New()
for _, fileType := range supportedFileTypes { // If it's not using default configuration or its configuration file is not available,
if file := fmt.Sprintf(`%s.%s`, key, fileType); c.Available(file) { // it searches the possible configuration file according to the name and all supported
c.SetFileName(file) // file types.
break if key != DefaultName || !c.Available() {
for _, fileType := range supportedFileTypes {
if file := fmt.Sprintf(`%s.%s`, key, fileType); c.Available(file) {
c.SetFileName(file)
break
}
} }
} }
return c return c

18
os/gcfg/gcfg_z_unit_instance_test.go
View File

@ -78,7 +78,6 @@ v4 = "1.234"
"cache": "127.0.0.1:6379,1", "cache": "127.0.0.1:6379,1",
}) })
t.AssertEQ(c.FilePath(), gfile.Pwd()+gfile.Separator+path) t.AssertEQ(c.FilePath(), gfile.Pwd()+gfile.Separator+path)
}) })
} }
@ -89,7 +88,7 @@ func Test_Instance_AutoLocateConfigFile(t *testing.T) {
// Automatically locate the configuration file with supported file extensions. // Automatically locate the configuration file with supported file extensions.
gtest.C(t, func(t *gtest.T) { gtest.C(t, func(t *gtest.T) {
pwd := gfile.Pwd() pwd := gfile.Pwd()
gfile.Chdir(gdebug.TestDataPath()) t.AssertNil(gfile.Chdir(gdebug.TestDataPath()))
defer gfile.Chdir(pwd) defer gfile.Chdir(pwd)
t.Assert(Instance("c1") != nil, true) t.Assert(Instance("c1") != nil, true)
t.Assert(Instance("c1").Get("my-config"), "1") t.Assert(Instance("c1").Get("my-config"), "1")
@ -98,10 +97,23 @@ func Test_Instance_AutoLocateConfigFile(t *testing.T) {
// Automatically locate the configuration file with supported file extensions. // Automatically locate the configuration file with supported file extensions.
gtest.C(t, func(t *gtest.T) { gtest.C(t, func(t *gtest.T) {
pwd := gfile.Pwd() pwd := gfile.Pwd()
gfile.Chdir(gdebug.TestDataPath("folder1")) t.AssertNil(gfile.Chdir(gdebug.TestDataPath("folder1")))
defer gfile.Chdir(pwd) defer gfile.Chdir(pwd)
t.Assert(Instance("c2").Get("my-config"), 2) t.Assert(Instance("c2").Get("my-config"), 2)
}) })
// Default configuration file.
gtest.C(t, func(t *gtest.T) {
instances.Clear()
pwd := gfile.Pwd()
t.AssertNil(gfile.Chdir(gdebug.TestDataPath("default")))
defer gfile.Chdir(pwd)
t.Assert(Instance().Get("my-config"), 1)
instances.Clear()
t.AssertNil(genv.Set("GF_GCFG_FILE", "config.json"))
defer genv.Set("GF_GCFG_FILE", "")
t.Assert(Instance().Get("my-config"), 2)
})
} }
func Test_Instance_EnvPath(t *testing.T) { func Test_Instance_EnvPath(t *testing.T) {

1
os/gcfg/testdata/default/config.json vendored Normal file
View File

@ -0,0 +1 @@
{"my-config": 2}

1
os/gcfg/testdata/default/config.toml vendored Normal file
View File

@ -0,0 +1 @@
my-config = "1"