Skip to content

Compatible with event stream redirect behavior. #262

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
solarkennedy merged 1 commit into from
Apr 9, 2019
Merged

Compatible with event stream redirect behavior. #262

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
13 changes: 10 additions & 3 deletions marathon/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,29 @@ def _do_request(self, method, path, params=None, data=None):

def _do_sse_request(self, path, params=None):
"""Query Marathon server for events."""
for server in list(self.servers):
url = ''.join([server.rstrip('/'), path])
urls = [''.join([server.rstrip('/'), path]) for server in self.servers]
while urls:
url = urls.pop()
try:
# Requests does not set the original Authorization header on cross origin
# redirects. If set allow_redirects=True we may get a 401 response.
response = self.sse_session.get(
url,
params=params,
stream=True,
headers={'Accept': 'text/event-stream'},
auth=self.auth,
verify=self.verify,
allow_redirects=False
)
except Exception as e:
marathon.log.error(
'Error while calling %s: %s', url, e.message)
else:
if response.ok:
if response.is_redirect and response.next:
urls.append(response.next.url)
marathon.log.debug("Got redirect to {}".format(response.next.url))
elif response.ok:
return response.iter_lines()

raise MarathonError('No remaining Marathon servers to try')
Expand Down