engine.Responder with ProcessCdr method, moved cdrs and mediator to engine

cmd/cgr-engine/cgr-engine.go

@@ -31,11 +31,9 @@ import (
 	"github.com/cgrates/cgrates/apier"
 	"github.com/cgrates/cgrates/balancer2go"
 	"github.com/cgrates/cgrates/cdrc"
-	"github.com/cgrates/cgrates/cdrs"
 	"github.com/cgrates/cgrates/config"
 	"github.com/cgrates/cgrates/engine"
 	"github.com/cgrates/cgrates/history"
-	"github.com/cgrates/cgrates/mediator"
 	"github.com/cgrates/cgrates/scheduler"
 	"github.com/cgrates/cgrates/sessionmanager"
 	"github.com/cgrates/cgrates/utils"
@@ -66,9 +64,9 @@ var (
 	exitChan        = make(chan bool)
 	server          = &engine.Server{}
 	scribeServer    history.Scribe
-	cdrServer       *cdrs.CDRS
+	cdrServer       *engine.CDRS
 	sm              sessionmanager.SessionManager
-	medi            *mediator.Mediator
+	medi            *engine.Mediator
 	cfg             *config.CGRConfig
 	err             error
 )
@@ -111,7 +109,7 @@ func startMediator(responder *engine.Responder, loggerDb engine.LogStorage, cdrD
 		connector = &engine.RPCClientConnector{Client: client}
 	}
 	var err error
-	medi, err = mediator.NewMediator(connector, loggerDb, cdrDb, cfg)
+	medi, err = engine.NewMediator(connector, loggerDb, cdrDb, cfg)
 	if err != nil {
 		engine.Logger.Crit(fmt.Sprintf("Mediator config parsing error: %v", err))
 		exitChan <- true
@@ -185,10 +183,11 @@ func startCDRS(responder *engine.Responder, cdrDb engine.CdrStorage, mediChan, d
 			return
 		}
 	}
-	cdrServer = cdrs.New(cdrDb, medi, cfg)
+	cdrServer = engine.NewCdrS(cdrDb, medi, cfg)
 	cdrServer.RegisterHanlersToServer(server)
 	engine.Logger.Info("Registering CDRS RPC service.")
 	server.RpcRegister(&apier.CDRSV1{CdrSrv: cdrServer})
+	responder.CdrSrv = cdrServer // Make the cdrserver available for internal communication
 	close(doneChan)
 }