uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

cgr-engine main is async again

Browse Source
This commit is contained in:
Radu Ioan Fericean
2014-01-23 11:25:32 +02:00
parent 962cf17884
commit ea75cd3aa2
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/cgr-engine/cgr-engine.go
View File

@@ -330,8 +330,8 @@ func main() {
stopHandled := false
// Async starts here
if cfg.RaterEnabled && cfg.RaterBalancer != "" && !cfg.BalancerEnabled {
registerToBalancer()
stopRaterSignalHandler()
go registerToBalancer()
go stopRaterSignalHandler()
stopHandled = true
}
responder := &engine.Responder{ExitChan: exitChan}
@@ -361,7 +361,7 @@ func main() {
engine.Logger.Info("Starting CGRateS Scheduler.")
go func() {
sched := scheduler.NewScheduler()
reloadSchedulerSingnalHandler(sched, accountDb)
go reloadSchedulerSingnalHandler(sched, accountDb)
apier.Sched = sched
sched.LoadActionTimings(accountDb)
sched.Loop()
@@ -370,28 +370,28 @@ func main() {
if cfg.SMEnabled {
engine.Logger.Info("Starting CGRateS SessionManager.")
startSessionManager(responder, logDb)
go startSessionManager(responder, logDb)
// close all sessions on shutdown
shutdownSessionmanagerSingnalHandler()
go shutdownSessionmanagerSingnalHandler()
}
if cfg.MediatorEnabled {
engine.Logger.Info("Starting CGRateS Mediator.")
startMediator(responder, logDb, cdrDb)
go startMediator(responder, logDb, cdrDb)
}
if cfg.CDRSEnabled {
engine.Logger.Info("Starting CGRateS CDR Server.")
startCDRS(responder, cdrDb)
go startCDRS(responder, cdrDb)
}
if cfg.HistoryServerEnabled || cfg.HistoryAgentEnabled {
engine.Logger.Info("Starting History Service.")
startHistoryScribe()
go startHistoryScribe()
}
if cfg.CdrcEnabled {
engine.Logger.Info("Starting CGRateS CDR Client.")
startCdrc()
go startCdrc()
}
go server.ServeGOB(cfg.RPCGOBListen)
go server.ServeJSON(cfg.RPCJSONListen)

8
engine/server.go
View File

@@ -58,11 +58,11 @@ func (s *Server) ServeJSON(addr string) {
for {
conn, err := lJSON.Accept()
if err != nil {
Logger.Err(fmt.Sprintf("<History> Accept error: %v", conn))
Logger.Err(fmt.Sprintf("<CGRServer> Accept error: %v", conn))
continue
}
Logger.Info(fmt.Sprintf("<History> New incoming connection: %v", conn.RemoteAddr()))
//Logger.Info(fmt.Sprintf("<CGRServer> New incoming connection: %v", conn.RemoteAddr()))
go jsonrpc.ServeConn(conn)
}
@@ -79,11 +79,11 @@ func (s *Server) ServeGOB(addr string) {
for {
conn, err := lGOB.Accept()
if err != nil {
Logger.Err(fmt.Sprintf("<History> Accept error: %v", conn))
Logger.Err(fmt.Sprintf("<CGRServer> Accept error: %v", conn))
continue
}
Logger.Info(fmt.Sprintf("<History> New incoming connection: %v", conn.RemoteAddr()))
//Logger.Info(fmt.Sprintf("<CGRServer> New incoming connection: %v", conn.RemoteAddr()))
go rpc.ServeConn(conn)
}
}