From 5d857f1255005e7f280e12e07ffe81568e266ac0 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Thu, 23 Jan 2014 13:18:00 +0100
Subject: [PATCH] Fix local tests

---
 apier/v1/apier_local_test.go    | 7 +------
 apier/v1/tutfscsv_local_test.go | 7 +------
 cmd/cgr-engine/cgr-engine.go    | 4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/apier/v1/apier_local_test.go b/apier/v1/apier_local_test.go
index 8aff9e17f..6e086049e 100644
--- a/apier/v1/apier_local_test.go
+++ b/apier/v1/apier_local_test.go
@@ -25,7 +25,6 @@ import (
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
 	"net/rpc"
-	"net/rpc/jsonrpc"
 	"os/exec"
 	"path"
 	"reflect"
@@ -135,11 +134,7 @@ func TestRpcConn(t *testing.T) {
 		return
 	}
 	var err error
-	if cfg.RPCEncoding == utils.JSON {
-		rater, err = jsonrpc.Dial("tcp", cfg.MediatorRater)
-	} else {
-		rater, err = rpc.Dial("tcp", cfg.MediatorRater)
-	}
+	rater, err = rpc.Dial("tcp", "127.0.0.1:2013") //ToDo: Fix with automatic config
 	if err != nil {
 		t.Fatal("Could not connect to rater: ", err.Error())
 	}
diff --git a/apier/v1/tutfscsv_local_test.go b/apier/v1/tutfscsv_local_test.go
index 6b5f8ef15..612ef82d3 100644
--- a/apier/v1/tutfscsv_local_test.go
+++ b/apier/v1/tutfscsv_local_test.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/utils"
-	"net/rpc"
 	"net/rpc/jsonrpc"
 	"os/exec"
 	"path"
@@ -102,11 +101,7 @@ func TestFsCsvRpcConn(t *testing.T) {
 		return
 	}
 	var err error
-	if cfg.RPCEncoding == utils.JSON {
-		rater, err = jsonrpc.Dial("tcp", cfg.MediatorRater)
-	} else {
-		rater, err = rpc.Dial("tcp", cfg.MediatorRater)
-	}
+	rater, err = jsonrpc.Dial("tcp", "127.0.0.1:2012") // ToDo: Fix here with config loaded from file
 	if err != nil {
 		t.Fatal("Could not connect to rater: ", err.Error())
 	}
diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 31b98a485..5c22c0873 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -88,7 +88,7 @@ func startMediator(responder *engine.Responder, loggerDb engine.LogStorage, cdrD
 			time.Sleep(time.Duration(i/2) * time.Second)
 		}
 		if err != nil {
-			engine.Logger.Crit(fmt.Sprintf("Could not connect to engine: %v", err))
+			engine.Logger.Crit(fmt.Sprintf("<Mediator> Could not connect to engine: %v", err))
 			exitChan <- true
 		}
 		connector = &engine.RPCClientConnector{Client: client}
@@ -130,7 +130,7 @@ func startSessionManager(responder *engine.Responder, loggerDb engine.LogStorage
 			time.Sleep(time.Duration(i/2) * time.Second)
 		}
 		if err != nil {
-			engine.Logger.Crit(fmt.Sprintf("Could not connect to engine: %v", err))
+			engine.Logger.Crit(fmt.Sprintf("<SessionManager> Could not connect to engine: %v", err))
 			exitChan <- true
 		}
 		connector = &engine.RPCClientConnector{Client: client}