From e38edb04ef7a4c21e65d916edf94103b4aa97bfc Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 4 Sep 2020 13:37:11 +0300 Subject: [PATCH] Resolve merge problems --- ees/httpjsonmap.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ees/httpjsonmap.go b/ees/httpjsonmap.go index 30b587111..ca19374a8 100644 --- a/ees/httpjsonmap.go +++ b/ees/httpjsonmap.go @@ -101,7 +101,10 @@ func (pstrEE *PosterJSONMapEE) ExportEvent(cgrEv *utils.CGREvent) (err error) { valMp := make(map[string]string) eeReq := NewEventExporterRequest(utils.MapStorage(cgrEv.Event), pstrEE.dc, - cgrEv.Tenant, pstrEE.cgrCfg.GeneralCfg().DefaultTimezone, pstrEE.filterS) + pstrEE.cgrCfg.EEsCfg().Exporters[pstrEE.cfgIdx].Tenant, + pstrEE.cgrCfg.GeneralCfg().DefaultTenant, + utils.FirstNonEmpty(pstrEE.cgrCfg.EEsCfg().Exporters[pstrEE.cfgIdx].Timezone, + pstrEE.cgrCfg.GeneralCfg().DefaultTimezone), pstrEE.filterS) if err = eeReq.SetFields(pstrEE.cgrCfg.EEsCfg().Exporters[pstrEE.cfgIdx].ContentFields()); err != nil { return