فهرست منبع

Minor cleanups

Ask Bjørn Hansen 7 سال پیش
والد
کامیت
e326bcd10f
3فایلهای تغییر یافته به همراه2 افزوده شده و 6 حذف شده
  1. 1 4
      server/serve.go
  2. 1 1
      targeting/targeting.go
  3. 0 1
      zones/zone_health_test.go

+ 1 - 4
server/serve.go

@@ -112,13 +112,10 @@ func (srv *Server) serve(w dns.ResponseWriter, req *dns.Msg, z *zones.Zone) {
 
 
 	targets, netmask, location := z.Options.Targeting.GetTargets(ip, z.HasClosest)
 	targets, netmask, location := z.Options.Targeting.GetTargets(ip, z.HasClosest)
 
 
-	if qle != nil {
-		qle.Targets = targets
-	}
-
 	m := new(dns.Msg)
 	m := new(dns.Msg)
 
 
 	if qle != nil {
 	if qle != nil {
+		qle.Targets = targets
 		defer func() {
 		defer func() {
 			qle.Rcode = m.Rcode
 			qle.Rcode = m.Rcode
 			qle.Answers = len(m.Answer)
 			qle.Answers = len(m.Answer)

+ 1 - 1
targeting/targeting.go

@@ -64,7 +64,7 @@ func (t TargetOptions) getGeoTargets(ip net.IP, hasClosest bool) ([]string, int,
 		if location == nil || err != nil {
 		if location == nil || err != nil {
 			return targets, 0, nil
 			return targets, 0, nil
 		}
 		}
-		log.Printf("Location for '%s' (%s): %+v", ip, err, location)
+		log.Printf("Location for '%s' (err: %s): %+v", ip, err, location)
 		country = location.Country
 		country = location.Country
 		continent = location.Continent
 		continent = location.Continent
 		region = location.Region
 		region = location.Region

+ 0 - 1
zones/zone_health_test.go

@@ -61,5 +61,4 @@ func TestHealth(t *testing.T) {
 	if len(records) == 0 {
 	if len(records) == 0 {
 		t.Log("didn't get any records")
 		t.Log("didn't get any records")
 	}
 	}
-
 }
 }