ipn/proxies,dnsx/transport: m log the chosen id among many

Author: ignoramous

intra/dnsx/transport.go

@@ -1110,7 +1110,7 @@ func (r *resolver) requiresGoosOrLocal(qname string) (id string) {
 	return
 }
 
-func (r *resolver) chooseOne(ids ...string) string {
+func (r *resolver) chooseOne(ids ...string) (theone string) {
 	if len(ids) <= 0 {
 		return ""
 	}
@@ -1131,14 +1131,21 @@ func (r *resolver) chooseOne(ids ...string) string {
 	r.RUnlock()
 
 	best, preferred, recoverables, errored, ended := Categorize(trs)
+	if settings.Debug {
+		defer func() {
+			loged(len(theone) <= 0)("dns: pref: chose: %s from best(%v) prefer(%v) recov(%v) err(%v) dead(%v)",
+				theone, best, preferred, recoverables, errored, ended)
+		}()
+	}
+
 	if len(best) > 0 {
-		return best[0].ID().V()
+		return idstr(best[0])
 	} else if len(preferred) > 0 {
-		return preferred[0].ID().V()
+		return idstr(preferred[0])
 	} else if len(recoverables) > 0 {
-		return recoverables[0].ID().V()
+		return idstr(core.ChooseOne(recoverables))
 	} else if len(errored) > 0 {
-		return errored[0].ID().V()
+		return idstr(core.ChooseOne(errored))
 	}
 	log.E("dns: pref: no transports for %v [all ended? %v]", ids, ended)
 	return ""

intra/ipn/proxies.go

@@ -446,7 +446,7 @@ func (px *proxifier) removeProxy(id string, force bool) bool {
 // ProxyTo implements Proxies.
 // May return both a Proxy and an error, in which case, the error
 // denotes that while the Proxy is not healthy, it is still registered.
-func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ Proxy, err error) {
+func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (theone Proxy, err error) {
 	ippstr := ipp.String()
 	e := func(err error) error {
 		return fmt.Errorf("%v for %s to %s among %v", err, uid, ippstr, pids)
@@ -525,8 +525,8 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
 	}
 
 	defer func() {
-		logev(err)("proxy: pin: %s+%s; stalled? %ds; local: %v; miss: %v; notok: %v; noroute: %v; paused %v; ended %v",
-			uid, ipp, stalledSec, loproxies, missproxies, notokproxies, norouteproxies, pausedproxies, endproxies)
+		logev(err)("proxy: pin: %s+%s; chosen? %s; stalled? %ds; local: %v; miss: %v; notok: %v; noroute: %v; paused %v; ended %v",
+			uid, ipp, theone, stalledSec, loproxies, missproxies, notokproxies, norouteproxies, pausedproxies, endproxies)
 	}()
 
 	for _, pid := range pids {