Be sure to detach one-shot timer watcher #1178
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
| @log.error "Timer detached.", title: @title | ||
| ensure | ||
| if attached? | ||
| detach unless @repeating |
There was a problem hiding this comment.
Is @repeating an instance variable of TimerWatcher?
I think it's too internal to use it, and it looks too fragile.
We should store repeat into our own instance variable in #initialize and use it.
Because, > I think it's too internal to use it, and it looks too fragile. We > should store repeat into our own instance variable in #initialize and > use it.
|
I've pushed change for comment @tagomoris |
| assert_equal(1, watchers.size) | ||
| assert(watchers.first.attached?) | ||
|
|
||
| sleep 3 |
There was a problem hiding this comment.
This sleep 3 makes tests slow and unstable.
The better way to make it well is like this (not tested code):
waiting_assertion = true
waiting_timer = true
counter = 0
d1.timer_execute(:test, 1, repeat: false) do
sleep 0.1 while waiting_assertion
counter += 1
waiting_timer = false
end
# assertions about watchers here
waiting_assertion = false
sleep 0.1 while waiting_timer
assert_equal(1, counter)
# rest of assertionsThere was a problem hiding this comment.
Thank you for sample code.
I will fix test code later.
There was a problem hiding this comment.
I've pushed a change for this comment.
This makes test faster and stable.
|
LGTM. |
|
Thanks! |
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.
See https://github.com/fluent/fluentd/pull/1059/files#r75269945