From c4e0d92a2ae40ccb3c3960a8e7a4f9dca80b30e6 Mon Sep 17 00:00:00 2001 From: arberkatellari Date: Thu, 26 Oct 2023 06:30:16 -0400 Subject: [PATCH] Make DNS TLS error log more suggestive --- agents/dnsagent.go | 2 +- services/dnsagent_it_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agents/dnsagent.go b/agents/dnsagent.go index e1403260f..4f0b5830c 100644 --- a/agents/dnsagent.go +++ b/agents/dnsagent.go @@ -62,7 +62,7 @@ func (da *DNSAgent) initDNSServer() (_ error) { if strings.HasSuffix(da.cgrCfg.DNSAgentCfg().Listeners[i].Network, utils.TLSNoCaps) { cert, err := tls.LoadX509KeyPair(da.cgrCfg.TLSCfg().ServerCerificate, da.cgrCfg.TLSCfg().ServerKey) if err != nil { - return err + return fmt.Errorf("load certificate error <%v>", err) } da.servers[i].Net = "tcp-tls" da.servers[i].TLSConfig = &tls.Config{ diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 9cb3f4845..5b7832b69 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -228,8 +228,8 @@ func TestDNSAgentReload4(t *testing.T) { dnsSrv.dns = nil err := dnsSrv.Start() - if err == nil || err.Error() != "open bad_certificate: no such file or directory" { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "open bad_certificate: no such file or directory", err) + if err == nil || err.Error() != "load certificate error " { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "load certificate error ", err) } dnsSrv.dns = nil @@ -290,8 +290,8 @@ func TestDNSAgentReload6(t *testing.T) { cfg.TLSCfg().ServerCerificate = "bad_certificate" cfg.TLSCfg().ServerKey = "bad_key" err = srv.Reload() - if err == nil || err.Error() != "open bad_certificate: no such file or directory" { - t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "open bad_certificate: no such file or directory", err) + if err == nil || err.Error() != "load certificate error " { + t.Errorf("\nExpected <%+v>, \nReceived <%+v>", "load certificate error ", err) } }