fix(updater): show the hint to disable a network when IP detection ti…

…meouts (#859)
favonia · Aug 10, 2024 · bdf154c · bdf154c
1 parent 14517e7
commit bdf154c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/internal/updater/updater.go b/internal/updater/updater.go
@@ -57,13 +57,7 @@ func detectIP(ctx context.Context, ppfmt pp.PP,
 	} else {
 		ppfmt.Warningf(pp.EmojiError, "Failed to detect the %s address", ipNet.Describe())
 
-		if ShouldDisplayHints[HintDetectionTimeouts] && errors.Is(context.Cause(ctx), errTimeout) {
-			ppfmt.Infof(pp.EmojiHint,
-				"If your network is experiencing high latency, consider increasing DETECTION_TIMEOUT=%v",
-				c.DetectionTimeout,
-			)
-			ShouldDisplayHints[HintDetectionTimeouts] = false
-		} else if ShouldDisplayHints[getHintIDForDetection(ipNet)] {
+		if ShouldDisplayHints[getHintIDForDetection(ipNet)] {
 			switch ipNet {
 			case ipnet.IP6:
 				ppfmt.Infof(pp.EmojiHint, "If you are using Docker or Kubernetes, IPv6 often requires additional setups")     //nolint:lll
@@ -73,6 +67,12 @@ func detectIP(ctx context.Context, ppfmt pp.PP,
 				ppfmt.Infof(pp.EmojiHint, "If your network does not support IPv4, you can disable it with IP4_PROVIDER=none") //nolint:lll
 			}
 		}
+		if ShouldDisplayHints[HintDetectionTimeouts] && errors.Is(context.Cause(ctx), errTimeout) {
+			ppfmt.Infof(pp.EmojiHint,
+				"If your network is experiencing high latency, consider increasing DETECTION_TIMEOUT=%v",
+				c.DetectionTimeout,
+			)
+		}
 	}
 	ShouldDisplayHints[getHintIDForDetection(ipNet)] = false
 	return ip, generateDetectMessage(ipNet, ok)

diff --git a/internal/updater/updater_test.go b/internal/updater/updater_test.go
@@ -556,6 +556,7 @@ func TestUpdateIPs(t *testing.T) {
 							},
 						),
 					p.EXPECT().Warningf(pp.EmojiError, "Failed to detect the %s address", "IPv4"),
+					p.EXPECT().Infof(pp.EmojiHint, "If your network does not support IPv4, you can disable it with IP4_PROVIDER=none"),                    //nolint:lll
 					p.EXPECT().Infof(pp.EmojiHint, "If your network is experiencing high latency, consider increasing DETECTION_TIMEOUT=%v", time.Second), //nolint:lll
 				)
 			},