From 140ef9292869df8a7a6fc6d1c159dc0c1b413d9a Mon Sep 17 00:00:00 2001
From: Eloy Coto <eloy.coto@gmail.com>
Date: Fri, 9 Oct 2015 12:24:59 +0100
Subject: [PATCH] Issue #234:     Added http_post and http_text on Cdrs
 Replication     Added as default 1 attemps in cdrs_replication (Old json
 version     doesn't have this option)     Added url scape on servername when
 file fallback is created. If not     can't be created

---
 config/config.go    |  3 +++
 config/libconfig.go | 14 ++++++++++++--
 engine/cdrs.go      | 42 +++++++++++++++++++++++++++++++-----------
 utils/consts.go     |  2 ++
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/config/config.go b/config/config.go
index f9e87cfa6..03113e739 100644
--- a/config/config.go
+++ b/config/config.go
@@ -676,6 +676,9 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) error {
 				}
 				if rplJsonCfg.Attempts != nil {
 					self.CDRSCdrReplication[idx].Attempts = *rplJsonCfg.Attempts
+				} else {
+					// Use 1 as default. If not the cdr will never send
+					self.CDRSCdrReplication[idx].Attempts = 1
 				}
 				if rplJsonCfg.Cdr_filter != nil {
 					if self.CDRSCdrReplication[idx].CdrFilter, err = utils.ParseRSRFields(*rplJsonCfg.Cdr_filter, utils.INFIELD_SEP); err != nil {
diff --git a/config/libconfig.go b/config/libconfig.go
index 38c5d0400..06c8cdf23 100644
--- a/config/libconfig.go
+++ b/config/libconfig.go
@@ -19,9 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package config
 
 import (
-	"time"
-
+	"fmt"
 	"github.com/cgrates/cgrates/utils"
+	"net/url"
+	"time"
 )
 
 type CdrReplicationCfg struct {
@@ -32,6 +33,15 @@ 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
+}
+
 type SureTaxCfg struct {
 	Url               string
 	ClientNumber      string
diff --git a/engine/cdrs.go b/engine/cdrs.go
index d9226c5e0..9d01a153c 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -366,20 +366,40 @@ func (self *CdrServer) replicateCdr(cdr *StoredCdr) error {
 		if !passesFilters { // Not passes filters, ignore this replication
 			continue
 		}
+		var body interface{}
+		var content = ""
 		switch rplCfg.Transport {
 		case utils.META_HTTP_POST:
-			errChan := make(chan error)
-			go func(cdr *StoredCdr, rplCfg *config.CdrReplicationCfg, errChan chan error) {
-				fallbackPath := path.Join(self.cgrCfg.HttpFailedDir, fmt.Sprintf("cdr_%s_%s_%s.form", rplCfg.Transport, rplCfg.Server, utils.GenUUID()))
-				if _, err := utils.HttpPoster(rplCfg.Server, self.cgrCfg.HttpSkipTlsVerify, cdr.AsHttpForm(), utils.CONTENT_FORM, rplCfg.Attempts, fallbackPath); err != nil {
-					utils.Logger.Err(fmt.Sprintf("<CDRReplicator> Replicating CDR: %+v, got error: %s", cdr, err.Error()))
-					errChan <- err
-				}
-				errChan <- nil
-			}(cdr, rplCfg, errChan)
-			if rplCfg.Synchronous { // Synchronize here
-				<-errChan
+			content = utils.CONTENT_FORM
+			body = cdr.AsHttpForm()
+		case utils.META_HTTP_TEXT:
+			content = utils.CONTENT_TEXT
+			body = cdr
+		case utils.META_HTTP_JSON:
+			content = utils.CONTENT_JSON
+			body = cdr
+		}
+
+		errChan := make(chan error)
+		go func(body interface{}, rplCfg *config.CdrReplicationCfg, content string, errChan chan error) {
+
+			fallbackPath := path.Join(
+				self.cgrCfg.HttpFailedDir,
+				rplCfg.GetFallbackFileName())
+
+			_, err := utils.HttpPoster(
+				rplCfg.Server, self.cgrCfg.HttpSkipTlsVerify, body,
+				content, rplCfg.Attempts, fallbackPath)
+			if err != nil {
+				utils.Logger.Err(fmt.Sprintf(
+					"<CDRReplicator> Replicating CDR: %+v, got error: %s", cdr, err.Error()))
+				errChan <- err
 			}
+			errChan <- nil
+
+		}(body, rplCfg, content, errChan)
+		if rplCfg.Synchronous { // Synchronize here
+			<-errChan
 		}
 	}
 	return nil
diff --git a/utils/consts.go b/utils/consts.go
index 8cf7defe4..b1e70ed01 100644
--- a/utils/consts.go
+++ b/utils/consts.go
@@ -205,6 +205,8 @@ const (
 	METATAG                      = "metatag"
 	HTTP_POST                    = "http_post"
 	META_HTTP_POST               = "*http_post"
+	META_HTTP_JSON               = "*http_json"
+	META_HTTP_TEXT               = "*http_text"
 	META_HTTP_JSONRPC            = "*http_jsonrpc"
 	NANO_MULTIPLIER              = 1000000000
 	CGR_AUTHORIZE                = "CGR_AUTHORIZE"