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

configurable http #3884

Merged
merged 3 commits into from
Jun 29, 2018
Merged

configurable http #3884

merged 3 commits into from
Jun 29, 2018

Conversation

jwkaltz
Copy link
Member

@jwkaltz jwkaltz commented Jun 29, 2018

Addresses #1826 (so far, only for lingua_extractor functionality, because currently only needed there).

@jwkaltz jwkaltz requested review from sbrunner and marionb June 29, 2018 12:51
if http_options is not None:
disable_ssl_certificate_validation = http_options.get("disable_ssl_certificate_validation", False)
http = httplib2.Http(disable_ssl_certificate_validation=disable_ssl_certificate_validation)
return http
Copy link
Member

Choose a reason for hiding this comment

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

simpler:

return httplib2.Http(**self.config.get("http_options", {}))

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed, thanks

@@ -245,6 +245,10 @@ vars:
# architecture.
external_themes_url:

# Available options for http sessions created within c2cgeoportal
http_options:
Copy link
Member

Choose a reason for hiding this comment

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

Should be added in CONST_config-schema.yaml

Copy link
Member Author

Choose a reason for hiding this comment

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

OK

@jwkaltz
Copy link
Member Author

jwkaltz commented Jun 29, 2018

@sbrunner can you please review once more?

Copy link
Member

@sbrunner sbrunner left a comment

Choose a reason for hiding this comment

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

Thanks :-)

@jwkaltz jwkaltz merged commit 1f3bfa0 into 2.2 Jun 29, 2018
@jwkaltz jwkaltz deleted the 2_2_configurable_http branch June 29, 2018 15:02
@sbrunner sbrunner added this to the 2.2 milestone Jul 6, 2018
@sbrunner
Copy link
Member

sbrunner commented Jul 6, 2018

Please when you have this kind oh hugly commits squash your commits, it makes the merge harder ...

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

Successfully merging this pull request may close these issues.

2 participants