From 64170765bb0fd6d896b68ee070ee173ca3b93e2e Mon Sep 17 00:00:00 2001 From: tijcolem Date: Mon, 20 Jul 2020 17:29:31 -0600 Subject: [PATCH 1/2] increase cpprestsdk default 30 seconds to 60 to account for longer response times. --- src/utilities/bcl/RemoteBCL.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/utilities/bcl/RemoteBCL.cpp b/src/utilities/bcl/RemoteBCL.cpp index 5219b687eeb..1c4d09fb04b 100644 --- a/src/utilities/bcl/RemoteBCL.cpp +++ b/src/utilities/bcl/RemoteBCL.cpp @@ -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); From 1a9482f0ce7bd4a841dfe590c1333a19203ee7d8 Mon Sep 17 00:00:00 2001 From: tijcolem Date: Tue, 21 Jul 2020 10:50:42 -0600 Subject: [PATCH 2/2] Fix failing unit test CLITest-test_bundle-bundle_git as new bundle workflow allows to load embedded gems when using bundler --- src/cli/test/bundle_git/test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/test/bundle_git/test.rb b/src/cli/test/bundle_git/test.rb index 184680f9bab..b1d6fa9b59d 100644 --- a/src/cli/test/bundle_git/test.rb +++ b/src/cli/test/bundle_git/test.rb @@ -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