Added occurrence for the WaitLogStrategy #100
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/cc @giorgioazzinnaro @mdelapenya can you have a look? |
mdelapenya
reviewed
Oct 3, 2019
wait/log.go
Outdated
| @@ -18,6 +18,7 @@ type LogStrategy struct { | |||
| // additional properties | |||
| Log string | |||
| PollInterval time.Duration | |||
| Occurence int | |||
There was a problem hiding this comment.
- Occurence int
+ Occurrence int
wait/log.go
Outdated
| @@ -26,6 +27,7 @@ func NewLogStrategy(log string) *LogStrategy { | |||
| startupTimeout: defaultStartupTimeout(), | |||
| Log: log, | |||
| PollInterval: 100 * time.Millisecond, | |||
| Occurence: 1, | |||
wait/log.go
Outdated
| @@ -46,6 +48,15 @@ func (ws *LogStrategy) WithPollInterval(pollInterval time.Duration) *LogStrategy | |||
| return ws | |||
| } | |||
|
|
|||
| func (ws *LogStrategy) WithOccurence(o int) *LogStrategy { | |||
| @@ -61,6 +72,7 @@ func (ws *LogStrategy) WaitUntilReady(ctx context.Context, target StrategyTarget | |||
| // limit context to startupTimeout | |||
| ctx, cancelContext := context.WithTimeout(ctx, ws.startupTimeout) | |||
| defer cancelContext() | |||
| currentOccurence := 0 | |||
There was a problem hiding this comment.
- currentOccurence := 0
+ currentOccurrence := 0| @@ -77,7 +89,10 @@ LOOP: | |||
| b, err := ioutil.ReadAll(reader) | |||
| logs := string(b) | |||
| if strings.Contains(logs, ws.Log) { | |||
| break LOOP | |||
| currentOccurence++ | |||
wait/log_test.go
Outdated
| } | ||
| wg := NewLogStrategy("dude"). | ||
| WithStartupTimeout(100 * time.Microsecond). | ||
| WithOccurence(2) |
wait/log_test.go
Outdated
| } | ||
| } | ||
|
|
||
| func TestWaitWithMaxOccurenceButItWillNeverHappen(t *testing.T) { |
wait/log_test.go
Outdated
| } | ||
| wg := NewLogStrategy("blaaa"). | ||
| WithStartupTimeout(100 * time.Microsecond). | ||
| WithOccurence(2) |
There was a problem hiding this comment.
Can we add an example with a high number of occurrences (around a hundred)? This way we will exercise the infinite loop better than with just two loops
gianarb
force-pushed
the
feature/wait-log-occurnace
branch
2 times, most recently
from
456f324 to
f04588c
Compare
This is related to the work @giorgioazzinnaro is doing here #98 . Now you can declare how many times a log line should appear before having the container declared as ready. Signed-off-by: Gianluca Arbezzano <[email protected]>
gianarb
force-pushed
the
feature/wait-log-occurnace
branch
from
f04588c to
e64d86b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is related to the work @giorgioazzinnaro is doing here
#98 .
Now you can declare how many times a log line should appear before
having the container declared as ready.
Signed-off-by: Gianluca Arbezzano [email protected]