Skip to content

uploader: enable handshake by default #2958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wchargin merged 1 commit into from
Nov 22, 2019
Merged

uploader: enable handshake by default #2958

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions tensorboard/uploader/uploader_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
_AUTH_SUBCOMMAND_KEY_REVOKE = 'REVOKE'

_DEFAULT_ORIGIN = "https://tensorboard.dev"
# Compatibility measure until server-side /api/uploader support is
# rolled out and stable.
_HARDCODED_API_ENDPOINT = "api.tensorboard.dev:443"


def _prompt_for_user_ack(intent):
Expand Down Expand Up @@ -506,10 +503,8 @@ def _get_intent(flags):

def _get_server_info(flags):
origin = flags.origin or _DEFAULT_ORIGIN
if not flags.origin:
# Temporary fallback to hardcoded API endpoint when not specified.
api_endpoint = flags.api_endpoint or _HARDCODED_API_ENDPOINT
return server_info_lib.create_server_info(origin, api_endpoint)
if flags.api_endpoint and not flags.origin:
return server_info_lib.create_server_info(origin, flags.api_endpoint)
server_info = server_info_lib.fetch_server_info(origin)
# Override with any API server explicitly specified on the command
# line, but only if the server accepted our initial handshake.
Expand Down