From cc8ecc4e513e13aa50de91580c92a1a3104a53c5 Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 10 Dec 2015 18:15:07 +0100 Subject: [PATCH] Fix for SMG CDR source to be the same between CDR and log --- sessionmanager/smg_event.go | 2 +- sessionmanager/smg_event_test.go | 2 +- sessionmanager/smg_session.go | 2 +- utils/consts.go | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sessionmanager/smg_event.go b/sessionmanager/smg_event.go index 070d4c528..74e65d9d9 100644 --- a/sessionmanager/smg_event.go +++ b/sessionmanager/smg_event.go @@ -204,7 +204,7 @@ func (self SMGenericEvent) GetOriginatorIP(fieldName string) string { } func (self SMGenericEvent) GetCdrSource() string { - return "SM_GENERIC_" + self.GetName() + return utils.SessionManagerGeneric // Needs to match the one in the SMGEvent.saveOperations } func (self SMGenericEvent) GetExtraFields() map[string]string { diff --git a/sessionmanager/smg_event_test.go b/sessionmanager/smg_event_test.go index debdd27a9..60f75ca24 100644 --- a/sessionmanager/smg_event_test.go +++ b/sessionmanager/smg_event_test.go @@ -148,7 +148,7 @@ func TestSMGenericEventAsStoredCdr(t *testing.T) { smGev["Extra1"] = "Value1" smGev["Extra2"] = 5 eStoredCdr := &engine.StoredCdr{CgrId: "0711eaa78e53937f1593dabc08c83ea04a915f2e", - TOR: utils.VOICE, AccId: "12345", CdrHost: "10.0.3.15", CdrSource: "SM_GENERIC_TEST_EVENT", ReqType: utils.META_PREPAID, + TOR: utils.VOICE, AccId: "12345", CdrHost: "10.0.3.15", CdrSource: "SMG", ReqType: utils.META_PREPAID, Direction: utils.OUT, Tenant: "cgrates.org", Category: "call", Account: "account1", Subject: "subject1", Destination: "+4986517174963", SetupTime: time.Date(2015, 11, 9, 14, 21, 24, 0, time.UTC), AnswerTime: time.Date(2015, 11, 9, 14, 22, 2, 0, time.UTC), Usage: time.Duration(83) * time.Second, Pdd: time.Duration(300) * time.Millisecond, Supplier: "supplier1", DisconnectCause: "NORMAL_DISCONNECT", diff --git a/sessionmanager/smg_session.go b/sessionmanager/smg_session.go index 2ee36f58e..a0f8cfbe3 100644 --- a/sessionmanager/smg_session.go +++ b/sessionmanager/smg_session.go @@ -206,7 +206,7 @@ func (self *SMGSession) saveOperations() error { var reply string err := self.cdrsrv.LogCallCost(&engine.CallCostLog{ CgrId: self.eventStart.GetCgrId(self.timezone), - Source: utils.SESSION_MANAGER_SOURCE, + Source: utils.SessionManagerGeneric, RunId: self.runId, CallCost: firstCC, CheckDuplicate: true, diff --git a/utils/consts.go b/utils/consts.go index 1dcebf439..1fbdb4fa9 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -261,6 +261,7 @@ const ( NegativePrefix = "!" MatchStartPrefix = "^" MatchEndPrefix = "$" + SessionManagerGeneric = "SMG" ) var (