From 05f58e061d3961003c58c85275675a95d9fad144 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 22 Jul 2016 10:17:53 +0300 Subject: [PATCH 1/3] updated docker go version --- data/docker/devel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/docker/devel/Dockerfile b/data/docker/devel/Dockerfile index 3b073a0af..71fd345d6 100644 --- a/data/docker/devel/Dockerfile +++ b/data/docker/devel/Dockerfile @@ -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 From f2bceb5fe05d3e547a389d4d5579809d5f80bd02 Mon Sep 17 00:00:00 2001 From: rbarrabe Date: Fri, 22 Jul 2016 15:52:18 +0200 Subject: [PATCH 2/3] Update stats_queue.go --- engine/stats_queue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/stats_queue.go b/engine/stats_queue.go index 51bcf094d..6abe86bd9 100644 --- a/engine/stats_queue.go +++ b/engine/stats_queue.go @@ -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 } From c35a260003b50cb81abd8ac49fedaed292674954 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 22 Jul 2016 17:59:56 +0300 Subject: [PATCH 3/3] fix for start hang --- engine/cache_store.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/cache_store.go b/engine/cache_store.go index 352f3ce36..c7d752d24 100644 --- a/engine/cache_store.go +++ b/engine/cache_store.go @@ -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(" 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(" 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(" delete all error: " + err.Error()) - } + }*/ } func (cs cacheDoubleStore) CountEntriesForPrefix(prefix string) int {