[ARVADOS] updated: bc8f7abd8a5d32ac8c67130b7a490d32089115af

[Git user]

Summary of changes:
 apps/workbench/app/models/arvados_api_client.rb | 3 +++
 apps/workbench/config/application.default.yml   | 4 ++++
 2 files changed, 7 insertions(+)

       via  bc8f7abd8a5d32ac8c67130b7a490d32089115af (commit)
       via  89aed0400b42c4fbf737ebe4981581ca021eb6c5 (commit)
      from  589de3bdd1e9f4f7a2cc64ad502e4d8e77cdd2c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bc8f7abd8a5d32ac8c67130b7a490d32089115af
Merge: 589de3b 89aed04
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Sep 28 09:59:36 2016 -0400

    Merge branch '9990-workbench-client-timeout' closes #9990


commit 89aed0400b42c4fbf737ebe4981581ca021eb6c5
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Sep 8 10:41:37 2016 -0400

    9990: Add configs for Workbench API client timeouts.

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index fc9635b..eb93dfc 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -85,6 +85,9 @@ class ArvadosApiClient
     if not @api_client
       @client_mtx.synchronize do
         @api_client = HTTPClient.new
+        @api_client.ssl_config.timeout = Rails.configuration.api_client_connect_timeout
+        @api_client.connect_timeout = Rails.configuration.api_client_connect_timeout
+        @api_client.receive_timeout = Rails.configuration.api_client_receive_timeout
         if Rails.configuration.arvados_insecure_https
           @api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
         else
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 5400deb..74d317b 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -219,6 +219,10 @@ common:
   # Ask Arvados API server to compress its response payloads.
   api_response_compression: true
 
+  # Timeouts for API requests.
+  api_client_connect_timeout: 120
+  api_client_receive_timeout: 300
+
   # ShellInABox service endpoint URL for a given VM.  If false, do not
   # offer web shell logins.
   #

-----------------------------------------------------------------------


hooks/post-receive
--