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

[Core] Proxy, fix the way we set the no proxy environment setting #1650

Merged
merged 1 commit into from
Jun 2, 2015

Conversation

remh
Copy link

@remh remh commented May 29, 2015

Fix #1594

Also:

  • simplify the proxy parsing
  • Move the code in a new utils module

@remh remh added this to the 5.4.0 milestone May 29, 2015
@remh remh force-pushed the remh/fix_no_proxy branch 3 times, most recently from 485ea79 to 68af21f Compare June 1, 2015 17:41
@remh
Copy link
Author

remh commented Jun 2, 2015

Looks like this one is GTG. Tests are passing despite what the travis -> github integration says.

proxy_settings = {}

# First we read the proxy configuration from datadog.conf
proxy_host = agentConfig.get('proxy_host', None)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.get(_, None) from you @remh I am surprised :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yeah, i copy pasted the old code around, will fix. Thanks

@LeoCavaille
Copy link
Member

Except for the few nitpicks, LGTM. Thanks for isolating this in a new ad hoc module.

@remh remh force-pushed the remh/fix_no_proxy branch from eefb65e to 3c939d1 Compare June 2, 2015 17:44
Fix #1594

Also:
* simplify the proxy parsing
* Move the code in a new utils module
@remh remh force-pushed the remh/fix_no_proxy branch from 71ed69d to 1c7d441 Compare June 2, 2015 17:45
remh pushed a commit that referenced this pull request Jun 2, 2015
[Core] Proxy, fix the way we set the no proxy environment setting
@remh remh merged commit 6d4e737 into master Jun 2, 2015
@LeoCavaille LeoCavaille deleted the remh/fix_no_proxy branch June 3, 2015 04:53
@coveralls
Copy link

coveralls commented Feb 11, 2017

Coverage Status

Changes Unknown when pulling 1c7d441 on remh/fix_no_proxy into ** on master**.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Core] Hardcoded no_proxy setting causes problems for EC2 metadata
3 participants