projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10585: Merge branch 'master' into 10587-python-cli-version
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_api_client.rb
diff --git
a/apps/workbench/app/models/arvados_api_client.rb
b/apps/workbench/app/models/arvados_api_client.rb
index df7778694db4da93dcca661aab9806af104c237e..eb93dfcfaa76d133635f8c55d429b1c00233bb37 100644
(file)
--- 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
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
if Rails.configuration.arvados_insecure_https
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
@@
-114,7
+117,7
@@
class ArvadosApiClient
Thread.current[:reader_tokens] ||
[]) +
[Rails.configuration.anonymous_user_token]).to_json,
Thread.current[:reader_tokens] ||
[]) +
[Rails.configuration.anonymous_user_token]).to_json,
- 'c
lient_session_id' => (Thread.current[:client_session
_id] || ''),
+ 'c
urrent_request_id' => (Thread.current[:current_request
_id] || ''),
}
if !data.nil?
data.each do |k,v|
}
if !data.nil?
data.each do |k,v|