From af90cc8e50217dab1bc595744b3ea4ec1da35319 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Wed, 17 Oct 2018 09:42:25 +0200
Subject: [PATCH] Optimized AsteriskAgent setChannelVar function

---
 agents/asteriskagent.go | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/agents/asteriskagent.go b/agents/asteriskagent.go
index e1b2ae2c3..86e79cab0 100644
--- a/agents/asteriskagent.go
+++ b/agents/asteriskagent.go
@@ -107,6 +107,21 @@ func (sma *AsteriskAgent) ListenAndServe() (err error) {
 	panic("<AsteriskAgent> ListenAndServe out of select")
 }
 
+// hangupChannel will disconnect from CGRateS side with congestion reason
+func (sma *AsteriskAgent) setChannelVar(chanID string, vars url.Values) (success bool) {
+	if _, err := sma.astConn.Call(aringo.HTTP_POST,
+		fmt.Sprintf("http://%s/ari/channels/%s/variable", // Asterisk having issue with variable terminating empty so harcoding param in url
+			sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx].Address, chanID),
+		vars); err != nil {
+		// Since we got error, disconnect channel
+		sma.hangupChannel(chanID,
+			fmt.Sprintf("<%s> error: %s setting %+v for channelID: %s",
+				utils.AsteriskAgent, err.Error(), vars, chanID))
+		return false
+	}
+	return true
+}
+
 // hangupChannel will disconnect from CGRateS side with congestion reason
 func (sma *AsteriskAgent) hangupChannel(channelID, warnMsg string) {
 	if warnMsg != "" {
@@ -154,20 +169,11 @@ func (sma *AsteriskAgent) handleStasisStart(ev *SMAsteriskEvent) {
 		return
 	} else if *authReply.MaxUsage != time.Duration(-1) {
 		//  Set absolute timeout for non-postpaid calls
-		if _, err := sma.astConn.Call(aringo.HTTP_POST,
-			fmt.Sprintf("http://%s/ari/channels/%s/variable?variable=%s&value=%d", // Asterisk having issue with variable terminating empty so harcoding param in url
-				sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx].Address,
-				ev.ChannelID(), CGRMaxSessionTime, int64(authReply.MaxUsage.Seconds()*1000)),
-			url.Values{"value": {strconv.FormatFloat(
-				authReply.MaxUsage.Seconds()*1000, 'f', -1, 64)}}); err != nil { // Asterisk expects value in ms
-			utils.Logger.Err(fmt.Sprintf("<%s> Error: %s when setting %s for channelID: %s",
-				utils.AsteriskAgent, err.Error(), CGRMaxSessionTime, ev.ChannelID()))
-			// Since we got error, disconnect channel
-			sma.hangupChannel(ev.ChannelID(), "")
+		if !sma.setChannelVar(ev.ChannelID(), url.Values{"value": {strconv.FormatFloat(
+			authReply.MaxUsage.Seconds()*1000, 'f', -1, 64)}}) {
 			return
 		}
 	}
-
 	// Exit channel from stasis
 	if _, err := sma.astConn.Call(aringo.HTTP_POST, fmt.Sprintf("http://%s/ari/channels/%s/continue",
 		sma.cgrCfg.AsteriskAgentCfg().AsteriskConns[sma.astConnIdx].Address,