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

Consider DNS requests when limiting caps

Browse Source
This commit is contained in:
ionutboangiu
2024-11-29 13:25:33 +02:00
committed by Dan Christian Bogos
parent a50cad7c3f
commit 204601a70f
6 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/dnsagent.go
View File

@@ -31,13 +31,14 @@ import (
// NewDNSAgent returns the DNS Agent
func NewDNSAgent(cfg *config.CGRConfig, filterSChan chan *engine.FilterS,
shdChan *utils.SyncedChan, connMgr *engine.ConnManager,
shdChan *utils.SyncedChan, connMgr *engine.ConnManager, caps *engine.Caps,
srvDep map[string]*sync.WaitGroup) servmanager.Service {
return &DNSAgent{
cfg: cfg,
filterSChan: filterSChan,
shdChan: shdChan,
connMgr: connMgr,
caps: caps,
srvDep: srvDep,
}
}
@@ -53,6 +54,7 @@ type DNSAgent struct {
dns *agents.DNSAgent
connMgr *engine.ConnManager
caps *engine.Caps
srvDep map[string]*sync.WaitGroup
}
@@ -67,7 +69,7 @@ func (dns *DNSAgent) Start() (err error) {
dns.Lock()
defer dns.Unlock()
dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr)
dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr, dns.caps)
if err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> failed to initialize agent, error: <%s>", utils.DNSAgent, err.Error()))
dns.dns = nil
@@ -90,7 +92,7 @@ func (dns *DNSAgent) Reload() (err error) {
close(dns.stopChan)
}
dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr)
dns.dns, err = agents.NewDNSAgent(dns.cfg, filterS, dns.connMgr, dns.caps)
if err != nil {
utils.Logger.Err(fmt.Sprintf("<%s> error: <%s>", utils.DNSAgent, err.Error()))
dns.dns = nil

14
services/dnsagent_it_test.go
View File

@@ -58,7 +58,7 @@ func TestDNSAgentStartReloadShut(t *testing.T) {
filterSChan <- nil
shdChan := utils.NewSyncedChan()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
shdWg := new(sync.WaitGroup)
srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg, nil)
engine.NewConnManager(cfg, nil)
@@ -122,7 +122,7 @@ func TestDNSAgentReloadFirst(t *testing.T) {
anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan birpc.ClientConnector, 1), srvDep)
sS := NewSessionService(cfg, db, server, make(chan birpc.ClientConnector, 1),
shdChan, nil, anz, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
engine.NewConnManager(cfg, nil)
srvMngr.AddServices(srv, sS,
NewLoaderService(cfg, db, filterSChan, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep), db)
@@ -193,8 +193,8 @@ func TestDNSAgentReload2(t *testing.T) {
filterSChan <- nil
shdChan := utils.NewSyncedChan()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
agentSrv, err := agents.NewDNSAgent(cfg, nil, nil)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
agentSrv, err := agents.NewDNSAgent(cfg, nil, nil, nil)
if err != nil {
t.Fatal(err)
}
@@ -221,7 +221,7 @@ func TestDNSAgentReload4(t *testing.T) {
filterSChan <- nil
shdChan := utils.NewSyncedChan()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
runtime.Gosched()
dnsSrv := srv.(*DNSAgent)
@@ -246,7 +246,7 @@ func TestDNSAgentReload5(t *testing.T) {
filterSChan <- nil
shdChan := utils.NewSyncedChan()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
err := srv.Start()
if err != nil {
t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", nil, err)
@@ -274,7 +274,7 @@ func TestDNSAgentReload6(t *testing.T) {
shdChan := utils.NewSyncedChan()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
cfg.DNSAgentCfg().Listeners[0].Address = "127.0.0.1:0"
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
time.Sleep(10 * time.Millisecond)
err := srv.Start()

4
services/dnsagent_test.go
View File

@@ -44,11 +44,11 @@ func TestDNSAgentCoverage(t *testing.T) {
cacheSChan := make(chan birpc.ClientConnector, 1)
cacheSChan <- cacheSrv
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, srvDep)
srv := NewDNSAgent(cfg, filterSChan, shdChan, nil, nil, srvDep)
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
dns, _ := agents.NewDNSAgent(cfg, &engine.FilterS{}, nil)
dns, _ := agents.NewDNSAgent(cfg, &engine.FilterS{}, nil, nil)
srv2 := DNSAgent{
cfg: cfg,
filterSChan: filterSChan,