lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 20:50:54 +00:00
Code Issues Releases Activity

Merge pull request #3250 from 0x0400/develop

Browse Source 
acquire lock when access config data
This commit is contained in:
astaxie 2018-07-21 15:25:23 +08:00 committed by GitHub
commit 03de7456ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/yaml/yaml.go
View File

@ -119,7 +119,7 @@ func parseYML(buf []byte) (cnf map[string]interface{}, err error) {
// ConfigContainer A Config represents the yaml configuration. // ConfigContainer A Config represents the yaml configuration.
type ConfigContainer struct { type ConfigContainer struct {
data map[string]interface{} data map[string]interface{}
sync.Mutex sync.RWMutex
} }
// Bool returns the boolean value for a given key. // Bool returns the boolean value for a given key.
@ -285,6 +285,9 @@ func (c *ConfigContainer) getData(key string) (interface{}, error) {
if len(key) == 0 { if len(key) == 0 {
return nil, errors.New("key is empty") return nil, errors.New("key is empty")
} }
c.RLock()
defer c.RUnlock()
keys := strings.Split(key, ".") keys := strings.Split(key, ".")
tmpData := c.data tmpData := c.data
for _, k := range keys { for _, k := range keys {