Remove `first` variable an extra if block
clean up the code slighly by moving the Sleep in WaitForState to the end of the loop.
This commit is contained in:
parent
82be35a797
commit
481f12cf2c
|
@ -81,30 +81,7 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
|
||||||
|
|
||||||
wait := 100 * time.Millisecond
|
wait := 100 * time.Millisecond
|
||||||
|
|
||||||
for first := true; ; first = false {
|
for {
|
||||||
if !first {
|
|
||||||
// If a poll interval has been specified, choose that interval.
|
|
||||||
// Otherwise bound the default value.
|
|
||||||
if conf.PollInterval > 0 && conf.PollInterval < 180*time.Second {
|
|
||||||
wait = conf.PollInterval
|
|
||||||
} else {
|
|
||||||
if wait < conf.MinTimeout {
|
|
||||||
wait = conf.MinTimeout
|
|
||||||
} else if wait > 10*time.Second {
|
|
||||||
wait = 10 * time.Second
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Printf("[TRACE] Waiting %s before next try", wait)
|
|
||||||
time.Sleep(wait)
|
|
||||||
|
|
||||||
// Wait between refreshes using exponential backoff, except when
|
|
||||||
// waiting for the target state to reoccur.
|
|
||||||
if targetOccurence == 0 {
|
|
||||||
wait *= 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
res, currentState, err := conf.Refresh()
|
res, currentState, err := conf.Refresh()
|
||||||
result := Result{
|
result := Result{
|
||||||
Result: res,
|
Result: res,
|
||||||
|
@ -173,6 +150,27 @@ func (conf *StateChangeConf) WaitForState() (interface{}, error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If a poll interval has been specified, choose that interval.
|
||||||
|
// Otherwise bound the default value.
|
||||||
|
if conf.PollInterval > 0 && conf.PollInterval < 180*time.Second {
|
||||||
|
wait = conf.PollInterval
|
||||||
|
} else {
|
||||||
|
if wait < conf.MinTimeout {
|
||||||
|
wait = conf.MinTimeout
|
||||||
|
} else if wait > 10*time.Second {
|
||||||
|
wait = 10 * time.Second
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[TRACE] Waiting %s before next try", wait)
|
||||||
|
time.Sleep(wait)
|
||||||
|
|
||||||
|
// Wait between refreshes using exponential backoff, except when
|
||||||
|
// waiting for the target state to reoccur.
|
||||||
|
if targetOccurence == 0 {
|
||||||
|
wait *= 2
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue