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

Merge branch 'master' of https://github.com/cgrates/cgrates

Browse Source
This commit is contained in:
DanB
2016-07-24 22:13:15 +02:00
parent 0979849150 9d44e121e4
commit b56ed46639
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/docker/devel/Dockerfile
View File

@@ -26,7 +26,7 @@ COPY mongod.conf /etc/mongod.conf
RUN useradd -c CGRateS -d /var/run/cgrates -s /bin/false -r cgrates
# install golang
RUN wget -qO- https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz | tar xzf - -C /root/
RUN wget -qO- https://storage.googleapis.com/golang/go1.6.3.linux-amd64.tar.gz | tar xzf - -C /root/
#install glide
RUN GOROOT=/root/go GOPATH=/root/code /root/go/bin/go get github.com/Masterminds/glide

12
engine/cache_store.go
View File

@@ -40,9 +40,9 @@ func (cs cacheDoubleStore) Put(key string, value interface{}) {
cs[prefix] = mp
}
mp[key] = value
if err := dumper.put(prefix, key, value); err != nil {
/*if err := dumper.put(prefix, key, value); err != nil {
utils.Logger.Info("<cache dumper> put error: " + err.Error())
}
}*/
}
func (cs cacheDoubleStore) Get(key string) (interface{}, error) {
@@ -84,18 +84,18 @@ func (cs cacheDoubleStore) Delete(key string) {
prefix, key := key[:PREFIX_LEN], key[PREFIX_LEN:]
if keyMap, ok := cs[prefix]; ok {
delete(keyMap, key)
if err := dumper.delete(prefix, key); err != nil {
/*if err := dumper.delete(prefix, key); err != nil {
utils.Logger.Info("<cache dumper> delete error: " + err.Error())
}
}*/
}
}
func (cs cacheDoubleStore) DeletePrefix(prefix string) {
delete(cs, prefix)
if err := dumper.deleteAll(prefix); err != nil {
/*if err := dumper.deleteAll(prefix); err != nil {
utils.Logger.Info("<cache dumper> delete all error: " + err.Error())
}
}*/
}
func (cs cacheDoubleStore) CountEntriesForPrefix(prefix string) int {

2
engine/stats_queue.go
View File

@@ -76,7 +76,7 @@ func (sq *StatsQueue) UpdateConf(conf *CdrStats) {
sq.mux.Lock()
defer sq.mux.Unlock()
// check if new conf asks for action trigger reset only
if sq.conf != nil && (!conf.hasGeneralConfigs() || sq.conf.equalExceptTriggers(conf)) {
if sq.conf != nil && (conf.hasGeneralConfigs() || sq.conf.equalExceptTriggers(conf)) {
sq.conf.Triggers = conf.Triggers
return
}