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

Added connection reload for DNSAgent

Browse Source
This commit is contained in:
Trial97
2019-09-26 14:02:15 +03:00
committed by Dan Christian Bogos
parent 4fae6f8e87
commit 91b1acbcc1
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agents/dnsagent.go
View File

@@ -82,15 +82,18 @@ func (da *DNSAgent) ListenAndServe() (err error) {
return da.server.ListenAndServe()
}
// Reload will stop the dns server and reinitialize it but will not start the server again
// Reload will reinitialize the server
// this is in order to monitor if we receive error on ListenAndServe
func (da *DNSAgent) Reload() (err error) {
if err = da.Shutdown(); err != nil {
return
}
return da.initDNSServer()
}
// SetSessionSConnection sets the new connection to the threshold service
// only used on reload
func (da *DNSAgent) SetSessionSConnection(sS rpcclient.RpcClientConnection) {
da.sS = sS
}
// handleMessage is the entry point of all DNS requests
// requests are reaching here asynchronously
func (da *DNSAgent) handleMessage(w dns.ResponseWriter, req *dns.Msg) {

29
services/dnsagent.go
View File

@@ -103,14 +103,37 @@ func (dns *DNSAgent) GetIntenternalChan() (conn chan rpcclient.RpcClientConnecti
// Reload handles the change of config
func (dns *DNSAgent) Reload(sp servmanager.ServiceProvider) (err error) {
var sS rpcclient.RpcClientConnection
utils.Logger.Info(fmt.Sprintf("starting %s service", utils.DNSAgent))
if !sp.GetConfig().DispatcherSCfg().Enabled && sp.GetConfig().DNSAgentCfg().SessionSConns[0].Address == utils.MetaInternal {
// sSInternal = true
srvSessionS, has := sp.GetService(utils.SessionS)
if !has {
utils.Logger.Err(fmt.Sprintf("<%s> Failed to find needed subsystem <%s>",
utils.DNSAgent, utils.SessionS))
return utils.ErrNotFound
}
sSIntConn := <-srvSessionS.GetIntenternalChan()
srvSessionS.GetIntenternalChan() <- sSIntConn
sS = utils.NewBiRPCInternalClient(sSIntConn.(*sessions.SessionS))
} else {
if sS, err = sp.GetConnection(utils.SessionS, sp.GetConfig().DNSAgentCfg().SessionSConns); err != nil {
utils.Logger.Crit(fmt.Sprintf("<%s> Could not connect to %s: %s",
utils.DNSAgent, utils.SessionS, err.Error()))
return
}
}
if err = dns.Shutdown(); err != nil {
return
}
dns.Lock()
defer dns.Unlock()
dns.dns.SetSessionSConnection(sS)
if err = dns.dns.Reload(); err != nil {
dns.dns = nil // make sure we mark this service as stoped to not close server twice
return err
return
}
go func() {
if err = dns.dns.ListenAndServe(); err != nil {
if err := dns.dns.ListenAndServe(); err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> error: <%s>", utils.DNSAgent, err.Error()))
sp.GetExitChan() <- true // stop the engine here
}