Keep track of absolute IDLE time for timeout #303
+74
−63
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
jonhoo
requested changes
Feb 16, 2025
src/extensions/idle.rs
Outdated
| // re-issue it at least every 29 minutes to avoid being logged off. | ||
| // This still allows a client to receive immediate mailbox updates even | ||
| // though it need only "poll" at half hour intervals. | ||
| let time_since_idle = Instant::now() - self.last_idle.map(Ok).unwrap_or_else(|| self.init())?; |
There was a problem hiding this comment.
Suggested change
| let time_since_idle = Instant::now() - self.last_idle.map(Ok).unwrap_or_else(|| self.init())?; | |
| let time_since_idle = self.last_idle.map(|t| Ok(t.elapsed())).unwrap_or_else(|| self.init())?; |
src/extensions/idle.rs
Outdated
Comment on lines
178
to
180
| // set_read_timeout() can fail if the argument is Some(0), which can never | ||
| // be the case here. | ||
| .unwrap(); |
There was a problem hiding this comment.
Suggested change
| // set_read_timeout() can fail if the argument is Some(0), which can never | |
| // be the case here. | |
| .unwrap(); | |
| .expect("cannot be Some(0) since time is monotonically increasing"); |
src/extensions/idle.rs
Outdated
| // re-issue it at least every 29 minutes to avoid being logged off. | ||
| // This still allows a client to receive immediate mailbox updates even | ||
| // though it need only "poll" at half hour intervals. | ||
| let time_since_idle = Instant::now() - self.last_idle.map(Ok).unwrap_or_else(|| self.init())?; |
There was a problem hiding this comment.
I think this means that if init fails, we may fail to reset the read timeout to None if we've already gone around the loop at least one? Because the ? here will return from the function, not into the match.
There was a problem hiding this comment.
True. Also from self.terminate()? a couple of lines below. I'll change both to break on Err instead of using ?.
src/extensions/idle.rs
Outdated
Comment on lines
188
to
203
| if self.keepalive { | ||
| self.terminate()?; | ||
| continue; | ||
| } |
There was a problem hiding this comment.
Nice — this makes the flow much better.
z33ky
force-pushed
the
abs-idle-timeout
branch
3 times, most recently
from
a94dedb to
3df945a
Compare
The code used to apply the set timeout value to the TcpStream before entering the IDLE loop. This effectively resets the timeout after receiving and handling incoming messages, which nullifies the purpose of the timeout when messages are received. This change remembers when the IDLE command is sent initially and uses that value to set the remaining time for the TcpStream timeout. This allows the IDLE loop to reconnect the IDLE connection at the appropriate time. Fixes jonhoo#300.
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.
Fixes #300.
This change is