microcloud/cmd: fix timeout issue

In case of mDNS discovery issue (no IPv6 support on a node for example), the timeout never seems to occur leading to wait forever. This should fix the issue Signed-off-by: Gabriel Mougard <[email protected]>
canonical · Dec 13, 2023 · c868554 · c868554
1 parent d926155
commit c868554
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/microcloud/cmd/microcloud/main_init.go b/microcloud/cmd/microcloud/main_init.go
@@ -179,14 +179,12 @@ func lookupPeers(s *service.Handler, autoSetup bool, iface *net.Interface, subne
 		}()
 	}
 
-	var timeAfter <-chan time.Time
+	timeoutDuration := time.Minute
 	if autoSetup {
-		timeAfter = time.After(5 * time.Second)
+		timeoutDuration = 5 * time.Second
 	}
 
-	if len(expectedSystems) > 0 {
-		timeAfter = time.After(1 * time.Minute)
-	}
+	timeAfter := time.After(timeoutDuration)
 
 	expectedSystemsMap := make(map[string]bool, len(expectedSystems))
 	for _, system := range expectedSystems {