From bab8f9d86d27140d685203c0b3cac95898b62270 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 5 Feb 2016 16:50:47 +0200 Subject: [PATCH] differenet function for parsing trigger dates --- apier/v1/triggers.go | 4 ++-- engine/tp_reader.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apier/v1/triggers.go b/apier/v1/triggers.go index 37b2b89b4..097269070 100644 --- a/apier/v1/triggers.go +++ b/apier/v1/triggers.go @@ -218,14 +218,14 @@ func (self *ApierV1) SetAccountActionTriggers(attr AttrSetAccountActionTriggers, at.MinSleep = minSleep } if attr.ExpirationDate != nil { - expTime, err := utils.ParseDate(*attr.ExpirationDate) + expTime, err := utils.ParseTimeDetectLayout(*attr.ExpirationDate) if err != nil { return 0, err } at.ExpirationDate = expTime } if attr.ActivationDate != nil { - actTime, err := utils.ParseDate(*attr.ActivationDate) + actTime, err := utils.ParseTimeDetectLayout(*attr.ActivationDate) if err != nil { return 0, err } diff --git a/engine/tp_reader.go b/engine/tp_reader.go index af4cae816..a27a4508b 100644 --- a/engine/tp_reader.go +++ b/engine/tp_reader.go @@ -797,8 +797,8 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *TpAccountAction) error for idx, apiAtr := range atrsLst { minSleep, _ := utils.ParseDurationWithSecs(apiAtr.MinSleep) balanceExpTime, _ := utils.ParseDate(apiAtr.BalanceExpirationDate) - expTime, _ := utils.ParseDate(apiAtr.ExpirationDate) - actTime, _ := utils.ParseDate(apiAtr.ActivationDate) + expTime, _ := utils.ParseTimeDetectLayout(apiAtr.ExpirationDate, tpr.timezone) + actTime, _ := utils.ParseTimeDetectLayout(apiAtr.ActivationDate, tpr.timezone) if apiAtr.UniqueID == "" { apiAtr.UniqueID = utils.GenUUID() } @@ -1030,8 +1030,8 @@ func (tpr *TpReader) LoadCdrStatsFiltered(tag string, save bool) (err error) { for idx, apiAtr := range atrsLst { minSleep, _ := utils.ParseDurationWithSecs(apiAtr.MinSleep) balanceExpTime, _ := utils.ParseDate(apiAtr.BalanceExpirationDate) - expTime, _ := utils.ParseDate(apiAtr.ExpirationDate) - actTime, _ := utils.ParseDate(apiAtr.ActivationDate) + expTime, _ := utils.ParseTimeDetectLayout(apiAtr.ExpirationDate, tpr.timezone) + actTime, _ := utils.ParseTimeDetectLayout(apiAtr.ActivationDate, tpr.timezone) if apiAtr.UniqueID == "" { apiAtr.UniqueID = utils.GenUUID() }