Skip to content

Fix #4014 download from BCL #4021

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
tijcolem merged 2 commits into from
Jul 27, 2020
Merged

Fix #4014 download from BCL #4021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6417076
increase cpprestsdk default 30 seconds to 60 to account for longer re…
tijcolem Jul 20, 2020
1a9482f
Fix failing unit test CLITest-test_bundle-bundle_git as new bundle wo…
tijcolem Jul 21, 2020
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
2 changes: 1 addition & 1 deletion src/cli/test/bundle_git/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ def local_gems
rescue LoadError
did_fail = true
end
raise "Should not load openstudio-standards" unless did_fail == true
raise "Should allow to load the embedded openstudio-standards" unless did_fail == false
3 changes: 3 additions & 0 deletions src/utilities/bcl/RemoteBCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ namespace openstudio{
// as it will allow us to change http_client_config (SSL settings etc) in only one place
web::http::client::http_client RemoteBCL::getClient(const std::string& url) const {
web::http::client::http_client_config config;
// bcl.nrel.gov can be slow to respond to client requests so bump the default of 30 seconds to 60 to account for lengthy response time.
// this is timeout is for each send and receive operation on the client and not the entire client session.
config.set_timeout(std::chrono::seconds(60));
config.set_validate_certificates(false);

return web::http::client::http_client(utility::conversions::to_string_t(url), config);
Expand Down