Skip to content
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.

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

[docker] be resilient to dockerpy buggy api calls #2608

Merged
merged 1 commit into from
Jun 16, 2016

Conversation

masci
Copy link
Contributor

@masci masci commented Jun 16, 2016

Due to a bug on docker-py, whenever the Docker api fails at returning a stream of events, the library returns a plain string instead of a Json as expected, thus raising warnings on collector's logs.

Waiting for docker/docker-py#1082 to be merged, this PR increases agent resilience to this problem.

The fix was tested by couple of customers.

@masci masci added the bugfix label Jun 16, 2016
@hkaj
Copy link
Member

hkaj commented Jun 16, 2016

LGTM, 🍰 for adding test coverage.

@masci masci added this to the 5.8.3 milestone Jun 16, 2016
@masci masci merged commit 76c2f43 into master Jun 16, 2016
@masci masci deleted the massi/handle_dockerapi_failing_events branch June 16, 2016 12:41
gmmeyer pushed a commit that referenced this pull request Jun 17, 2016
…events

[docker] be resilient to dockerpy buggy api calls
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants