From 25b2fdb6ec8f636d32232f2121ef9930a30b3b93 Mon Sep 17 00:00:00 2001
From: andronache <andrei.andronache@itsyscom.com>
Date: Wed, 10 Feb 2021 14:37:32 +0200
Subject: [PATCH] Fixed function in services

---
 services/freeswitchagent_it_test.go |  2 +-
 services/kamailioagent.go           |  7 +++----
 services/kamailioagent_it_test.go   | 12 ++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go
index ddb66e941..dbf3cb627 100644
--- a/services/freeswitchagent_it_test.go
+++ b/services/freeswitchagent_it_test.go
@@ -92,7 +92,7 @@ func TestFreeSwitchAgentReload(t *testing.T) {
 	}
 
 	srv.(*FreeswitchAgent).fS = agents.NewFSsessions(agentCfg, "", nil)
-	//srv.(*FreeswitchAgent).fS = new(agents.FSsessions)
+
 	err := srv.Reload()
 	if err != nil {
 		t.Errorf("\nExpected <%+v>, \nReceived <%+v>", nil, err)
diff --git a/services/kamailioagent.go b/services/kamailioagent.go
index fa0f79b57..dab69d9db 100644
--- a/services/kamailioagent.go
+++ b/services/kamailioagent.go
@@ -78,12 +78,11 @@ func (kam *KamailioAgent) Start() (err error) {
 
 // Reload handles the change of config
 func (kam *KamailioAgent) Reload() (err error) {
-
-	if err = kam.Shutdown(); err != nil {
-		return
-	}
 	kam.Lock()
 	defer kam.Unlock()
+	if err = kam.kam.Shutdown(); err != nil {
+		return
+	}
 	kam.kam.Reload()
 	go func(k *agents.KamailioAgent) {
 		if err = k.Connect(); err != nil {
diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go
index 24a84cc0d..8fe3e2522 100644
--- a/services/kamailioagent_it_test.go
+++ b/services/kamailioagent_it_test.go
@@ -26,6 +26,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cgrates/cgrates/agents"
+
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/cores"
 	"github.com/cgrates/cgrates/engine"
@@ -76,7 +78,17 @@ func TestKamailioAgentReload(t *testing.T) {
 	} else if reply != utils.OK {
 		t.Errorf("Expecting OK ,received %s", reply)
 	}
+	kaCfg := &config.KamAgentCfg{
+		Enabled:       true,
+		SessionSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)},
+		CreateCdr:     true,
+		EvapiConns:    []*config.KamConnCfg{{Address: "127.0.0.1:8448", Reconnects: 10, Alias: "randomAlias"}},
+		Timezone:      "Local",
+	}
 
+	srv.(*KamailioAgent).kam = agents.NewKamailioAgent(kaCfg, nil, "")
+
+	srv.Reload()
 	runtime.Gosched()
 	time.Sleep(10 * time.Millisecond) //need to switch to gorutine
 	// the engine should be stoped as we could not connect to kamailio