This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Use parse_duration for fed client timeout/retry options #15778
Closed
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
MatMaul
changed the title
DMRobertson
reviewed
Jun 14, 2023
| @@ -404,10 +404,10 @@ def __init__( | |||
| self.clock = hs.get_clock() | |||
| self._store = hs.get_datastores().main | |||
| self.version_string_bytes = hs.version_string.encode("ascii") | |||
| self.default_timeout = hs.config.federation.client_timeout | |||
| self.default_timeout = hs.config.federation.client_timeout / 1000 | |||
There was a problem hiding this comment.
This is in seconds now...
There was a problem hiding this comment.
parse_duration returns milliseconds.
| else: | ||
| _sec_timeout = self.default_timeout | ||
| if timeout is None: | ||
| timeout = int(self.default_timeout) |
There was a problem hiding this comment.
So this is also in seconds now...
There was a problem hiding this comment.
For bonus points, leave a comment saying this is in seconds/milliseconds/whatever.
For a gold star, rename to self.timeout_seconds etc!
| if timeout is None: | ||
| timeout = int(self.default_timeout) | ||
|
|
||
| _sec_timeout = timeout / 1000 |
There was a problem hiding this comment.
which means that this is in kiloseconds if timeout is None, but seconds otherwise. That seems wrong.
Ditto below.
|
@DMRobertson docs do need some update, seems like I did the changes and then didn't commit them... |
|
Superseeded by #15783. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Pull Request Checklist
(run the linters)