Browse Source

fix error propagation for nxdomain

Darien Raymond 6 years ago
parent
commit
f41b07395a
1 changed files with 3 additions and 3 deletions
  1. 3 3
      app/dns/server.go

+ 3 - 3
app/dns/server.go

@@ -241,13 +241,13 @@ func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, err
 		if len(ips) > 0 {
 		if len(ips) > 0 {
 			return ips, nil
 			return ips, nil
 		}
 		}
-		if err == dns.ErrEmptyResponse {
-			return nil, err
-		}
 		if err != nil {
 		if err != nil {
 			newError("failed to lookup ip for domain ", domain, " at server ", client.Name()).Base(err).WriteToLog()
 			newError("failed to lookup ip for domain ", domain, " at server ", client.Name()).Base(err).WriteToLog()
 			lastErr = err
 			lastErr = err
 		}
 		}
+		if err != context.Canceled && err != context.DeadlineExceeded {
+			return nil, err
+		}
 	}
 	}
 
 
 	return nil, newError("returning nil for domain ", domain).Base(lastErr)
 	return nil, newError("returning nil for domain ", domain).Base(lastErr)