fix(utils): adjust getPeerInfo position
This commit is contained in:
+7
-6
@@ -110,12 +110,6 @@ func getPeerFromRules(ctx context.Context, srv *tsnet.Server, rules map[string][
|
|||||||
func peerConnectivityLogic(ctx context.Context, lc *local.Client, relativePeers []netip.Addr, logger *slog.Logger) {
|
func peerConnectivityLogic(ctx context.Context, lc *local.Client, relativePeers []netip.Addr, logger *slog.Logger) {
|
||||||
for _, peer := range relativePeers {
|
for _, peer := range relativePeers {
|
||||||
loLog := logger.With("peer", peer)
|
loLog := logger.With("peer", peer)
|
||||||
peerInfo, err := lc.WhoIs(ctx, peer.String())
|
|
||||||
if err != nil {
|
|
||||||
loLog.Warn("failed to get peer info", "err", err)
|
|
||||||
} else {
|
|
||||||
loLog = loLog.With("name", peerInfo.Node.ComputedName)
|
|
||||||
}
|
|
||||||
|
|
||||||
ping, err := func() (*ipnstate.PingResult, error) {
|
ping, err := func() (*ipnstate.PingResult, error) {
|
||||||
cnclCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
cnclCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||||
@@ -134,6 +128,13 @@ func peerConnectivityLogic(ctx context.Context, lc *local.Client, relativePeers
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
peerInfo, err := lc.WhoIs(ctx, peer.String())
|
||||||
|
if err != nil {
|
||||||
|
loLog.Warn("failed to get peer info", "err", err)
|
||||||
|
} else {
|
||||||
|
loLog = loLog.With("name", peerInfo.Node.ComputedName)
|
||||||
|
}
|
||||||
|
|
||||||
var connect string
|
var connect string
|
||||||
if ping.DERPRegionCode == "" {
|
if ping.DERPRegionCode == "" {
|
||||||
connect = "direct"
|
connect = "direct"
|
||||||
|
|||||||
Reference in New Issue
Block a user