Skip to content

Commit 37d7943

Browse files
committed
fix: Minimize logging when waiting for IP address
1 parent 4f29ed6 commit 37d7943

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

pkg/drivers/common/common.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,6 @@ func getIPAddressFromFile(mac, path string) (string, error) {
206206
if err != nil {
207207
return "", err
208208
}
209-
210-
log.Debugf("Searching for %s in %s ...", mac, path)
211209
file, err := os.Open(path)
212210
if err != nil {
213211
return "", err

pkg/drivers/krunkit/krunkit.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,14 @@ func (d *Driver) setupIP(mac string) error {
286286
return nil
287287
}
288288
// Implement a retry loop because IP address isn't added to dhcp leases file immediately
289-
for i := 0; i < 60; i++ {
290-
log.Debugf("Attempt %d", i)
289+
const maxAttempts = 60
290+
for i := 0; i < maxAttempts; i++ {
291291
err = getIP()
292292
if err == nil {
293293
break
294294
}
295295
time.Sleep(2 * time.Second)
296+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts)
296297
}
297298

298299
if err == nil {

pkg/drivers/qemu/qemu.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ const (
5656
isoFilename = "boot2docker.iso"
5757
serialFileName = "serial.log"
5858
privateNetworkName = "docker-machines"
59-
60-
defaultSSHUser = "docker"
59+
defaultSSHUser = "docker"
6160
)
6261

6362
type Driver struct {
@@ -521,13 +520,15 @@ func (d *Driver) Start() error {
521520
if detect.NestedVM() {
522521
multiplier = 3 // will help with running in Free github action Macos VMs (takes 112+ retries on average)
523522
}
524-
for i := 0; i < 60*multiplier; i++ {
525-
log.Debugf("Attempt %d", i)
523+
524+
maxAttempts := 60 * multiplier
525+
for i := 0; i < maxAttempts; i++ {
526526
err = getIP()
527527
if err == nil {
528528
break
529529
}
530530
time.Sleep(2 * time.Second)
531+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts)
531532
}
532533

533534
if err == nil {

pkg/drivers/vfkit/vfkit.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,15 @@ func (d *Driver) setupIP(mac string) error {
361361
if detect.NestedVM() {
362362
multiplier = 3 // will help with running in Free github action Macos VMs (takes 160+ retries on average)
363363
}
364-
for i := 0; i < 60*multiplier; i++ {
365-
log.Debugf("Attempt %d", i)
364+
365+
maxAttempts := 60 * multiplier
366+
for i := 0; i < maxAttempts; i++ {
366367
err = getIP()
367368
if err == nil {
368369
break
369370
}
370371
time.Sleep(2 * time.Second)
372+
log.Debugf("Searching for %s in %s (attempt %d/%d)", d.MACAddress, common.LeasesPath, i+1, maxAttempts)
371373
}
372374

373375
if err == nil {

0 commit comments

Comments
 (0)