dnsx/plus: m debug logs

Author: ignoramous

intra/dnsx/alg.go

@@ -1959,6 +1959,14 @@ func idstr(t Transport) string {
 	return t.ID().V()
 }
 
+func infcsv(ts ...Transport) string {
+	var s []string
+	for _, t := range ts {
+		s = append(s, idstr(t)+":"+getaddrstr(t))
+	}
+	return strings.Join(s, ",")
+}
+
 func getaddrstr(t Transport) string {
 	if t == nil {
 		return notransport

intra/dnsx/plus.go

@@ -159,6 +159,11 @@ func (t *plus) ordered() ([]Transport, error) {
 	ord = append(ord, preferred...)
 	ord = append(ord, recov...)
 
+	ord = core.CopyUniq(ord)
+	if len(ord) < plusMaxTries {
+		ord = core.CopyUniq(ord, errored)
+	}
+
 	prev := ord
 	strat := settings.PlusStrat.Load()
 	switch strat {
@@ -173,11 +178,12 @@ func (t *plus) ordered() ([]Transport, error) {
 	}
 
 	if len(ord) <= 0 {
-		log.W("plus: zero transports avail [exp: %d]: errored: %v / ended: %v",
-			expected, errored, ended)
+		log.W("plus: strat %d: zero transports avail [exp: %d]: sys? %s / pref: %s / errored: %v / ended: %v",
+			strat, expected, idstr(sys), infcsv(preferred...), infcsv(errored...), infcsv(ended...))
 		return nil, errNoSuchTransport
 	} else if len(ord) < len(prev) {
-		log.VV("plus: filtered %d < chosen %d; chosen: %v", len(ord), len(prev), ord)
+		log.VV("plus: strat %d: filtered %d < chosen %d; chosen: %s / pref: %v",
+			strat, len(ord), len(prev), infcsv(ord...), infcsv(preferred...))
 	}
 
 	return ord, nil
@@ -205,7 +211,7 @@ func (t *plus) forward(network string, q *dns.Msg, outSmm *x.DNSSummary, all ...
 	defer func() {
 		fillSummary(finalsmm, outSmm)
 		if finalans != nil { // suppress errors
-			log.D("plus: suppressing errors for %s:%d[%s]: %v", qname, qtype, finalsmm.RData, errs)
+			log.D("plus: suppressing errors for %s:%d[%s]: %v", qname, qtyp, outSmm.RData, errs)
 			errs = nil
 		}
 	}()

intra/dnsx/transport.go

@@ -638,8 +638,8 @@ func (r *resolver) forward(q []byte, uid string, chosenids ...string) (res0 []by
 	}
 	ansblocked := xdns.AQuadAUnspecified(ans1)
 
-	log.V("dns: fwd: 5 for %s[%s]; query %s, smm[data: %s, status: %d]; new-ans? %t, blocklists? %t, blocked? %t",
-		smm.ID, uid, qname, smm.RData, smm.Status, isnewans, hasblocklists, ansblocked)
+	log.V("dns: fwd: 5 for %s[%s]; query %s:%d, smm[data: %s, status: %d]; new-ans? %t, blocklists? %t, blocked? %t",
+		smm.ID, uid, qname, qtyp, smm.RData, smm.Status, isnewans, hasblocklists, ansblocked)
 
 	return res2, smm.ID, nil
 }