Fix reconnect logic #447
Merged
Fix reconnect logic #447
Conversation
This file contains hidden or 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
Member
cheukt
commented
Sep 27, 2023
cheukt
commented
- sessions client was overwriting dial options in the robot client, so making an actual copy
- on reconnect, sessions client actually wants the new socket address, so got that instead of the address of the robot itself
cheukt
requested review from
clintpurser,
benjirewis and
maximpertsov
and removed request for
clintpurser
src/viam/sessions_client.py
Outdated
Comment on lines
53
to
61
| if dial_options is not None: | ||
| self._dial_options = DialOptions( | ||
| disable_webrtc=True, | ||
| auth_entity=dial_options.auth_entity, | ||
| credentials=dial_options.credentials, | ||
| insecure=dial_options.insecure, | ||
| allow_insecure_downgrade=dial_options.allow_insecure_downgrade, | ||
| allow_insecure_with_creds_downgrade=dial_options.allow_insecure_with_creds_downgrade, | ||
| ) |
There was a problem hiding this comment.
Let's use deepcopy here (from copy import deepcopy), otherwise we'll need to remember to add new dial option fields here too.
Suggested change
| if dial_options is not None: | |
| self._dial_options = DialOptions( | |
| disable_webrtc=True, | |
| auth_entity=dial_options.auth_entity, | |
| credentials=dial_options.credentials, | |
| insecure=dial_options.insecure, | |
| allow_insecure_downgrade=dial_options.allow_insecure_downgrade, | |
| allow_insecure_with_creds_downgrade=dial_options.allow_insecure_with_creds_downgrade, | |
| ) | |
| if dial_options is not None: | |
| self._dial_options = deepcopy(dial_options) |
| self._dial_options = DialOptions(disable_webrtc=True) | ||
|
|
||
| self._dial_options = deepcopy(dial_options) if dial_options is not None else DialOptions() | ||
| self._dial_options.disable_webrtc = True |
There was a problem hiding this comment.
ah nice, yeah i forgot we always want webrtc disabled here - good catch
maximpertsov
approved these changes
Sep 28, 2023
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.