From 35d75eba8dbc2d208f4bfca5f9146926bc56998a Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Tue, 12 May 2015 22:39:44 +0300 Subject: [PATCH 1/5] added category for maxduration console command --- console/maxduration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/maxduration.go b/console/maxduration.go index 47bade62b..3133a9fe3 100644 --- a/console/maxduration.go +++ b/console/maxduration.go @@ -24,7 +24,7 @@ func init() { c := &CmdGetMaxDuration{ name: "maxduration", rpcMethod: "Responder.GetMaxSessionTime", - clientArgs: []string{"Direction", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject"}, + clientArgs: []string{"Direction", "Category", "TOR", "Tenant", "Subject", "Account", "Destination", "TimeStart", "TimeEnd", "CallDuration", "FallbackSubject"}, } commands[c.Name()] = c c.CommandExecuter = &CommandExecuter{c} From de75662a1d9dff487699ceb2a43c319734dad83b Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Tue, 12 May 2015 22:40:01 +0300 Subject: [PATCH 2/5] put the nil ratinginfo protection back --- engine/balances.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/balances.go b/engine/balances.go index 69d390cc9..6b5dd5b42 100644 --- a/engine/balances.go +++ b/engine/balances.go @@ -420,10 +420,10 @@ func (b *Balance) DebitMoney(cd *CallDescriptor, ub *Account, count bool, dryRun ts.createIncrementsSlice() } //log.Printf("TS: %+v", ts) - /*if ts.RateInterval == nil { + if ts.RateInterval == nil { Logger.Err(fmt.Sprintf("Nil RateInterval ERROR on TS: %+v, CC: %+v, from CD: %+v", ts, cc, cd)) continue - }*/ + } maxCost, strategy := ts.RateInterval.GetMaxCost() //log.Printf("Timing: %+v", ts.RateInterval.Timing) //log.Printf("Rate: %+v", ts.RateInterval.Rating) From e92ac249b2f5cbd4dc5c23886939dc54c033a981 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 13 May 2015 13:16:13 +0300 Subject: [PATCH 3/5] run GOPATH and GOROOT binaries first --- data/docker/devel/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/docker/devel/start.sh b/data/docker/devel/start.sh index 260a0e278..548f3bf3f 100755 --- a/data/docker/devel/start.sh +++ b/data/docker/devel/start.sh @@ -15,7 +15,7 @@ cd /usr/share/cgrates/storage/mysql && ./setup_cgr_db.sh root CGRateS.org cd /usr/share/cgrates/storage/postgres && ./setup_cgr_db.sh #env vars -export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$PATH:$GOROOT/bin:$GOPATH/bin +export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$GOROOT/bin:$GOPATH/bin:$PATH # build and install cgrates /root/cgr/update_external_libs.sh @@ -29,5 +29,5 @@ cd /usr/share/cgrates/tutorials/fs_evsock/freeswitch/etc/ && tar xzf freeswitch_ cd /root/cgr echo "for cgradmin run: cgr-engine -config_dir data/conf/samples/cgradmin" -echo 'export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$PATH:$GOROOT/bin:$GOPATH/bin'>>/root/.zshrc +echo 'export GOROOT=/root/go; export GOPATH=/root/code; export PATH=$GOROOT/bin:$GOPATH/bin:$PATH'>>/root/.zshrc zsh From 6d2e84bd36f31d12391ddf293b7ed8f346a54650 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 13 May 2015 13:26:49 +0300 Subject: [PATCH 4/5] fix tutorial offpeak timings --- data/tariffplans/tutorial/Timings.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/tariffplans/tutorial/Timings.csv b/data/tariffplans/tutorial/Timings.csv index 2c5ad517e..59fbab0a9 100644 --- a/data/tariffplans/tutorial/Timings.csv +++ b/data/tariffplans/tutorial/Timings.csv @@ -2,6 +2,6 @@ ALWAYS,*any,*any,*any,*any,00:00:00 ASAP,*any,*any,*any,*any,*asap PEAK,*any,*any,*any,1;2;3;4;5,08:00:00 -OFFPEAK_MORNING,*any,*any,*any,1,00:00:00 +OFFPEAK_MORNING,*any,*any,*any,1;2;3;4;5,00:00:00 OFFPEAK_EVENING,*any,*any,*any,1;2;3;4;5,19:00:00 OFFPEAK_WEEKEND,*any,*any,*any,6;7,00:00:00 From 91d29f8135a2a532d9e07036f289854550230ca7 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Wed, 13 May 2015 13:31:01 +0300 Subject: [PATCH 5/5] units debit missing rateinterval protection --- engine/balances.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engine/balances.go b/engine/balances.go index 6b5dd5b42..397867bd8 100644 --- a/engine/balances.go +++ b/engine/balances.go @@ -324,6 +324,10 @@ func (b *Balance) DebitUnits(cd *CallDescriptor, ub *Account, moneyBalances Bala ts.createIncrementsSlice() } //log.Printf("TS: %+v", ts) + if ts.RateInterval == nil { + Logger.Err(fmt.Sprintf("Nil RateInterval ERROR on TS: %+v, CC: %+v, from CD: %+v", ts, cc, cd)) + continue + } maxCost, strategy := ts.RateInterval.GetMaxCost() for incIndex, inc := range ts.Increments { // debit minutes and money