From a7b71bae43a0f18724fd04557f4fc40cde4bb66d Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Tue, 8 Apr 2014 21:30:23 +0200
Subject: [PATCH] Fixup CgrId in FS-SM

---
 cdrs/fscdr.go             | 2 +-
 sessionmanager/fsevent.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cdrs/fscdr.go b/cdrs/fscdr.go
index 769952c06..82f342f91 100644
--- a/cdrs/fscdr.go
+++ b/cdrs/fscdr.go
@@ -76,7 +76,7 @@ func (fsCdr FSCdr) New(body []byte) (utils.RawCDR, error) {
 }
 
 func (fsCdr FSCdr) GetCgrId() string {
-	setupTime, _ := utils.ParseTimeDetectLayout(fsCdr.vars[FS_SETUP_TIME])
+	setupTime, _ := fsCdr.GetSetupTime()
 	return utils.Sha1(fsCdr.vars[FS_UUID], setupTime.String())
 }
 func (fsCdr FSCdr) GetAccId() string {
diff --git a/sessionmanager/fsevent.go b/sessionmanager/fsevent.go
index 32f780693..dad7b98a3 100644
--- a/sessionmanager/fsevent.go
+++ b/sessionmanager/fsevent.go
@@ -122,7 +122,8 @@ func (fsev FSEvent) GetTOR(fieldName string) string {
 	return utils.FirstNonEmpty(fsev[fieldName], fsev[TOR], config.CgrConfig().DefaultTOR)
 }
 func (fsev FSEvent) GetCgrId() string {
-	return utils.Sha1(fsev[UUID], fsev[SETUP_TIME])
+	setupTime, _ := fsev.GetSetupTime("")
+	return utils.Sha1(fsev[UUID], setupTime.String())
 }
 func (fsev FSEvent) GetUUID() string {
 	return fsev[UUID]