lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-06-12 22:20:38 +00:00
Code Issues Releases Activity

Merge branch 'astaxie/develop' into environmentVar

Browse Source 
# Conflicts:
#	config/fake.go
#	config/xml/xml_test.go
#	config/yaml/yaml_test.go
This commit is contained in:
ysqi
2016-03-10 19:57:16 +08:00
parent 36f69a04a9 f45b271b96
commit 86c7f1db9e
52 changed files with 1205 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/yaml/yaml.go
View File

@ -227,14 +227,18 @@ func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
// Strings returns the []string value for a given key.
func (c *ConfigContainer) Strings(key string) []string {
return strings.Split(c.String(key), ";")
v := c.String(key)
if v == "" {
return nil
}
return strings.Split(v, ";")
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
v := c.Strings(key)
if len(v) == 0 {
if v == nil {
return defaultval
}
return v

4
config/yaml/yaml_test.go
View File

@ -105,4 +105,8 @@ func TestYaml(t *testing.T) {
} else if strings.Contains(dbinfo["detail"], os.Getenv("GOROOT")) == false {
t.Fatal("get GOROOT path error")
}
if yamlconf.Strings("emptystrings") != nil {
t.Fatal("get emtpy strings error")
}
}