uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-15 21:29:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

Users - fix memory leak in case of AddIndex method

Browse Source
This commit is contained in:
DanB
2017-01-17 18:51:03 +01:00
parent 736dda2da8
commit 6ddcbbea04
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
engine/users.go
View File

@@ -112,9 +112,8 @@ func newUserMap(accountingDb AccountingStorage, indexes []string) *UserMap {
}
}
func (um *UserMap) ReloadUsers(in string, reply *string) error {
func (um *UserMap) ReloadUsers(in string, reply *string) (err error) {
um.mu.Lock()
// backup old data
oldTable := um.table
oldIndex := um.index
@@ -124,34 +123,33 @@ func (um *UserMap) ReloadUsers(in string, reply *string) error {
um.properties = make(map[string]*prop)
// load from db
if ups, err := um.accountingDb.GetUsers(); err == nil {
for _, up := range ups {
um.table[up.GetId()] = up.Profile
um.properties[up.GetId()] = &prop{weight: up.Weight, masked: up.Masked}
}
} else {
// restore old data before return
ups, err := um.accountingDb.GetUsers()
if err != nil { // restore old data before return
um.table = oldTable
um.index = oldIndex
um.properties = oldProperties
*reply = err.Error()
um.mu.Unlock()
return err
}
for _, up := range ups {
um.table[up.GetId()] = up.Profile
um.properties[up.GetId()] = &prop{weight: up.Weight, masked: up.Masked}
}
um.mu.Unlock()
if len(um.indexKeys) != 0 {
var s string
if err := um.AddIndex(um.indexKeys, &s); err != nil {
utils.Logger.Err(fmt.Sprintf("Error adding %v indexes to user profile service: %v", um.indexKeys, err))
um.mu.Lock()
um.table = oldTable
um.index = oldIndex
um.properties = oldProperties
*reply = err.Error()
um.mu.Unlock()
return err
}
}
*reply = utils.OK
return nil
}
@@ -320,15 +318,20 @@ func (um *UserMap) GetUsers(up *UserProfile, results *UserProfiles) error {
return nil
}
// AddIndex is a method to dynamically add indexes to already existing ones
func (um *UserMap) AddIndex(indexes []string, reply *string) error {
um.mu.Lock()
defer um.mu.Unlock()
um.indexKeys = append(um.indexKeys, indexes...)
for key, values := range um.table {
up := &UserProfile{Profile: values}
up.SetId(key)
um.addIndex(up, indexes)
}
for _, idxKey := range indexes {
if !utils.IsSliceMember(um.indexKeys, idxKey) {
um.indexKeys = append(um.indexKeys, idxKey)
}
}
*reply = utils.OK
return nil
}