agent: Provide better DNS setup error messages

This commit is contained in:
Armon Dadgar 2014-07-17 10:57:15 -07:00
parent be215e6717
commit 663bd102e7
1 changed files with 3 additions and 3 deletions

View File

@ -84,14 +84,14 @@ func NewDNSServer(agent *Agent, config *DNSConfig, logOutput io.Writer, domain,
go func() { go func() {
err := server.ListenAndServe() err := server.ListenAndServe()
srv.logger.Printf("[ERR] dns: error starting udp server: %v", err) srv.logger.Printf("[ERR] dns: error starting udp server: %v", err)
errCh <- err errCh <- fmt.Errorf("dns udp setup failed: %v", err)
}() }()
errChTCP := make(chan error, 1) errChTCP := make(chan error, 1)
go func() { go func() {
err := serverTCP.ListenAndServe() err := serverTCP.ListenAndServe()
srv.logger.Printf("[ERR] dns: error starting tcp server: %v", err) srv.logger.Printf("[ERR] dns: error starting tcp server: %v", err)
errChTCP <- err errChTCP <- fmt.Errorf("dns tcp setup failed: %v", err)
}() }()
// Check the server is running, do a test lookup // Check the server is running, do a test lookup
@ -107,7 +107,7 @@ func NewDNSServer(agent *Agent, config *DNSConfig, logOutput io.Writer, domain,
c := new(dns.Client) c := new(dns.Client)
in, _, err := c.Exchange(m, bind) in, _, err := c.Exchange(m, bind)
if err != nil { if err != nil {
checkCh <- err checkCh <- fmt.Errorf("dns test query failed: %v", err)
return return
} }