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

compilation fix

Browse Source
This commit is contained in:
Radu Ioan Fericean
2014-07-29 12:48:56 +03:00
parent 4ea9d8f35a
commit f2da780893
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config_test.go
View File

@@ -108,7 +108,7 @@ func TestDefaults(t *testing.T) {
}
eCfg.MediatorEnabled = false
eCfg.MediatorRater = utils.INTERNAL
eCfg.MediatorRaterReconnects = 3
eCfg.MediatorReconnects = 3
eCfg.MediatorStats = utils.INTERNAL
eCfg.SMEnabled = false
eCfg.SMSwitchType = FS

11
engine/cdrs.go
View File

@@ -24,15 +24,14 @@ import (
"net/http"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
var (
cfg *config.CGRConfig // Share the configuration with the rest of the package
storage engine.CdrStorage
storage CdrStorage
medi *Mediator
stats engine.StatsInterface
stats StatsInterface
)
// Returns error if not able to properly store the CDR, mediation is async since we can always recover offline
@@ -40,7 +39,7 @@ func storeAndMediate(storedCdr *utils.StoredCdr) error {
if stats != nil {
go func() {
if err := stats.AppendCDR(storedCdr, nil); err != nil {
engine.Logger.Err(fmt.Sprintf("Could not append cdr to stats: %s", err.Error()))
Logger.Err(fmt.Sprintf("Could not append cdr to stats: %s", err.Error()))
}
}()
}
@@ -89,10 +88,10 @@ func NewCdrS(s CdrStorage, m *Mediator, st *Stats, c *config.CGRConfig) *CDRS {
stats = st
if cfg.CDRSStats != "" {
if cfg.CDRSStats != utils.INTERNAL {
if s, err := engine.NewProxyStats(cfg.CDRSStats); err == nil {
if s, err := NewProxyStats(cfg.CDRSStats); err == nil {
stats = s
} else {
engine.Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service : %s", err.Error()))
Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service : %s", err.Error()))
}
}
} else {

12
engine/mediator.go
View File

@@ -24,7 +24,6 @@ import (
"time"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -38,10 +37,10 @@ func NewMediator(connector Connector, logDb LogStorage, cdrDb CdrStorage, st Sta
}
if m.cgrCfg.MediatorStats != "" {
if m.cgrCfg.MediatorStats != utils.INTERNAL {
if s, err := engine.NewProxyStats(m.cgrCfg.MediatorStats); err == nil {
if s, err := NewProxyStats(m.cgrCfg.MediatorStats); err == nil {
m.stats = s
} else {
engine.Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service (mediator): %s", err.Error()))
Logger.Err(fmt.Sprintf("Errors connecting to CDRS stats service (mediator): %s", err.Error()))
}
}
} else {
@@ -172,7 +171,7 @@ func (self *Mediator) RateCdr(storedCdr *utils.StoredCdr, sendToStats bool) erro
if sendToStats && self.stats != nil {
go func() {
if err := self.stats.AppendCDR(cdr, nil); err != nil {
engine.Logger.Err(fmt.Sprintf("Could not append cdr to stats (mediator): %s", err.Error()))
Logger.Err(fmt.Sprintf("Could not append cdr to stats (mediator): %s", err.Error()))
}
}()
}
@@ -184,15 +183,14 @@ func (self *Mediator) RateCdr(storedCdr *utils.StoredCdr, sendToStats bool) erro
return nil
}
func (self *Mediator) RateCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects []string,
orderIdStart, orderIdEnd int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated bool, sendToStats bool) error {
func (self *Mediator) RateCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects []string, orderIdStart, orderIdEnd int64, timeStart, timeEnd time.Time, rerateErrors, rerateRated, sendToStats bool) error {
cdrs, err := self.cdrDb.GetStoredCdrs(cgrIds, runIds, tors, cdrHosts, cdrSources, reqTypes, directions, tenants, categories, accounts, subjects, destPrefixes, ratedAccounts, ratedSubjects,
orderIdStart, orderIdEnd, timeStart, timeEnd, !rerateErrors, !rerateRated, true)
if err != nil {
return err
}
for _, cdr := range cdrs {
if err := self.RateCdr(cdr, sentToStats); err != nil {
if err := self.RateCdr(cdr, sendToStats); err != nil {
return err
}
}

2
test.sh
View File

@@ -1,4 +1,4 @@
1#! /usr/bin/env sh
#! /usr/bin/env sh
go test -i github.com/cgrates/cgrates/engine
go test -i github.com/cgrates/cgrates/sessionmanager