reuse connectivity check ticker

agent.go

@@ -372,35 +372,36 @@ func (a *Agent) connectivityChecks() {
 		}
 	}
 
-	for {
-		interval := defaultKeepaliveInterval
+	interval := defaultKeepaliveInterval
 
-		updateInterval := func(x time.Duration) {
-			if x != 0 && (interval == 0 || interval > x) {
-				interval = x
-			}
+	updateInterval := func(x time.Duration) {
+		if x != 0 && (interval == 0 || interval > x) {
+			interval = x
 		}
+	}
 
-		switch lastConnectionState {
-		case ConnectionStateNew, ConnectionStateChecking: // While connecting, check candidates more frequently
-			updateInterval(a.checkInterval)
-		case ConnectionStateConnected, ConnectionStateDisconnected:
-			updateInterval(a.keepaliveInterval)
-		default:
-		}
-		// Ensure we run our task loop as quickly as the minimum of our various configured timeouts
-		updateInterval(a.disconnectedTimeout)
-		updateInterval(a.failedTimeout)
+	switch lastConnectionState {
+	case ConnectionStateNew, ConnectionStateChecking: // While connecting, check candidates more frequently
+		updateInterval(a.checkInterval)
+	case ConnectionStateConnected, ConnectionStateDisconnected:
+		updateInterval(a.keepaliveInterval)
+	default:
+	}
+	// Ensure we run our task loop as quickly as the minimum of our various configured timeouts
+	updateInterval(a.disconnectedTimeout)
+	updateInterval(a.failedTimeout)
 
-		t := time.NewTimer(interval)
+	t := time.NewTicker(interval)
+	defer t.Stop()
+
+	for {
 		select {
 		case <-a.forceCandidateContact:
-			t.Stop()
+			t.Reset(interval)
 			contact()
 		case <-t.C:
 			contact()
 		case <-a.loop.Done():
-			t.Stop()
 			return
 		}
 	}