Merge branch 'master' into hapool

This commit is contained in:
Radu Ioan Fericean
2015-11-30 20:12:41 +02:00
48 changed files with 1403 additions and 706 deletions

View File

@@ -162,7 +162,6 @@ func (self *SMGeneric) GetLcrSuppliers(gev SMGenericEvent, clnt *rpc2.Client) ([
// Execute debits for usage/maxUsage
func (self *SMGeneric) SessionUpdate(gev SMGenericEvent, clnt *rpc2.Client) (time.Duration, error) {
var minMaxUsage time.Duration
evMaxUsage, err := gev.GetMaxUsage(utils.META_DEFAULT, self.cgrCfg.MaxCallDuration)
if err != nil {
return nilDuration, err
@@ -172,12 +171,12 @@ func (self *SMGeneric) SessionUpdate(gev SMGenericEvent, clnt *rpc2.Client) (tim
if maxDur, err := s.debit(evMaxUsage); err != nil {
return nilDuration, err
} else {
if maxDur < minMaxUsage {
minMaxUsage = maxDur
if maxDur < evMaxUsage {
evMaxUsage = maxDur
}
}
}
return minMaxUsage, nil
return evMaxUsage, nil
}
// Called on session start