Changed cgrid hash to build using SetupTime.UTC()

This commit is contained in:
DanB
2014-07-09 12:31:45 +02:00
committed by Radu Ioan Fericean
parent 50750e2dc2
commit 8017af8aab
5 changed files with 10 additions and 5 deletions

View File

@@ -137,7 +137,7 @@ func (fsev FSEvent) GetCategory(fieldName string) string {
}
func (fsev FSEvent) GetCgrId() string {
setupTime, _ := fsev.GetSetupTime(utils.META_DEFAULT)
return utils.Sha1(fsev[UUID], setupTime.String())
return utils.Sha1(fsev[UUID], setupTime.UTC().String())
}
func (fsev FSEvent) GetUUID() string {
return fsev[UUID]
@@ -251,6 +251,7 @@ func (fsev FSEvent) ParseEventValue(rsrFld *utils.RSRField) string {
}
func (fsev FSEvent) PassesFieldFilter(fieldFilter *utils.RSRField) (bool, string) {
// Keep in sync (or merge) with StoredCdr.PassesFieldFielter()
if fieldFilter == nil {
return true, ""
}

View File

@@ -504,7 +504,7 @@ func TestParseEventValue(t *testing.T) {
cfg, _ = config.NewDefaultCGRConfig()
config.SetCgrConfig(cfg)
ev := new(FSEvent).New(hangupEv)
if cgrid := ev.ParseEventValue(&utils.RSRField{Id: utils.CGRID}); cgrid != "8b1ca78a9bbaa42c811e60b974188197c425dbe7" {
if cgrid := ev.ParseEventValue(&utils.RSRField{Id: utils.CGRID}); cgrid != "873e5bf7903978f305f7d8fed3f92f968cf82873" {
t.Error("Unexpected cgrid parsed", cgrid)
}
if tor := ev.ParseEventValue(&utils.RSRField{Id: utils.TOR}); tor != utils.VOICE {
@@ -559,3 +559,7 @@ func TestParseEventValue(t *testing.T) {
t.Error("Unexpected result parsed", parsed)
}
}
func TestPassesFieldFilter(t *testing.T) {
}