From 831e633281d8c8d88165f06c1f97a0574b413ba7 Mon Sep 17 00:00:00 2001 From: DanB Date: Tue, 13 Oct 2015 12:43:33 +0200 Subject: [PATCH] Compress a bit GetFileName of CdrReplicationCfg --- config/libconfig.go | 9 ++------- engine/cdrs.go | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/config/libconfig.go b/config/libconfig.go index 06c8cdf23..09744ee33 100644 --- a/config/libconfig.go +++ b/config/libconfig.go @@ -33,13 +33,8 @@ type CdrReplicationCfg struct { CdrFilter utils.RSRFields // Only replicate if the filters here are matching } -func (rplCfg CdrReplicationCfg) GetFallbackFileName() string { - serverName := url.QueryEscape(rplCfg.Server) - - result := fmt.Sprintf("cdr_%s_%s_%s.form", - rplCfg.Transport, - serverName, utils.GenUUID()) - return result +func (rplCfg CdrReplicationCfg) FallbackFileName() string { + return fmt.Sprintf("cdr_%s_%s_%s.form", rplCfg.Transport, url.QueryEscape(rplCfg.Server), utils.GenUUID()) } type SureTaxCfg struct { diff --git a/engine/cdrs.go b/engine/cdrs.go index 5f5f13932..18c429ce5 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -379,11 +379,9 @@ func (self *CdrServer) replicateCdr(cdr *StoredCdr) error { errChan := make(chan error) go func(body interface{}, rplCfg *config.CdrReplicationCfg, content string, errChan chan error) { - fallbackPath := path.Join( self.cgrCfg.HttpFailedDir, - rplCfg.GetFallbackFileName()) - + rplCfg.FallbackFileName()) _, err := utils.HttpPoster( rplCfg.Server, self.cgrCfg.HttpSkipTlsVerify, body, content, rplCfg.Attempts, fallbackPath) @@ -398,6 +396,7 @@ func (self *CdrServer) replicateCdr(cdr *StoredCdr) error { if rplCfg.Synchronous { // Synchronize here <-errChan } + } return nil }