added api connection_timeout to recover from lost connections #303
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
non-Jedi
requested changes
Oct 9, 2019
There was a problem hiding this comment.
Please also rebase on master so CI passes and signoff per https://github.com/matrix-org/matrix-python-sdk/blob/master/CONTRIBUTING.rst. I would also recommend transitioning to https://github.com/poljar/matrix-nio as it's actually maintained.
| @@ -111,7 +111,8 @@ def global_callback(incoming_event): | |||
|
|
|||
| def __init__(self, base_url, token=None, user_id=None, | |||
| valid_cert_check=True, sync_filter_limit=20, | |||
| cache_level=CACHE.ALL, encryption=False, encryption_conf=None): | |||
| cache_level=CACHE.ALL, encryption=False, encryption_conf=None, | |||
| api_connection_timeout=60): | |||
There was a problem hiding this comment.
Can we just call this timeout instead of connection_timeout or api_connection_timeout for conciseness?
| @@ -57,7 +57,8 @@ class MatrixHttpApi(object): | |||
| def __init__( | |||
| self, base_url, token=None, identity=None, | |||
| default_429_wait_ms=5000, | |||
| use_authorization_header=True | |||
| use_authorization_header=True, | |||
| connection_timeout=60 | |||
| @@ -111,7 +111,8 @@ def global_callback(incoming_event): | |||
|
|
|||
| def __init__(self, base_url, token=None, user_id=None, | |||
| valid_cert_check=True, sync_filter_limit=20, | |||
| cache_level=CACHE.ALL, encryption=False, encryption_conf=None): | |||
| cache_level=CACHE.ALL, encryption=False, encryption_conf=None, | |||
| api_connection_timeout=60): | |||
|
i'd love to see this being merged |
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.
if connection lost during listening the _send method does not return cause it calls self.session.request without the timeout keyword argument which defaults to None. i added an optional keyword argument to MatrixHttpApi and MatrixClient that specifies a timeout to pass to self.session.request