projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12033: browserify is needed in production env, for package-building.
[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 17c5ec6a3a62192a7481d03946d6822eb99f1fb9..8638b0aa510b08cab457cf115fa9d42163ea6bd9 100644
(file)
--- a/
apps/workbench/app/models/arvados_api_client.rb
+++ b/
apps/workbench/app/models/arvados_api_client.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require 'httpclient'
require 'thread'
require 'httpclient'
require 'thread'
@@
-85,11
+89,17
@@
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
# Use system CA certificates
if Rails.configuration.arvados_insecure_https
@api_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
else
# Use system CA certificates
- @api_client.ssl_config.add_trust_ca('/etc/ssl/certs')
+ ["/etc/ssl/certs/ca-certificates.crt",
+ "/etc/pki/tls/certs/ca-bundle.crt"]
+ .select { |ca_path| File.readable?(ca_path) }
+ .each { |ca_path| @api_client.ssl_config.add_trust_ca(ca_path) }
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
end
if Rails.configuration.api_response_compression
@api_client.transparent_gzip_decompression = true
@@
-111,6
+121,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,
+ 'current_request_id' => (Thread.current[:current_request_id] || ''),
}
if !data.nil?
data.each do |k,v|
}
if !data.nil?
data.each do |k,v|
@@
-121,7
+132,7
@@
class ArvadosApiClient
elsif v == false
query[k] = 0
else
elsif v == false
query[k] = 0
else
- query[k] =
JSON.dump(v
)
+ query[k] =
Oj.dump(v, mode: :compat
)
end
end
else
end
end
else
@@
-134,7
+145,7
@@
class ArvadosApiClient
header = {"Accept" => "application/json"}
header = {"Accept" => "application/json"}
- profile_checkpoint { "Prepare request #{
url} #{query[:uuid]} #{query[:where]} #{query[:filters]} #{query[:order
]}" }
+ profile_checkpoint { "Prepare request #{
query["_method"] or "POST"} #{url} #{query[:uuid]} #{query.inspect[0,256
]}" }
msg = @client_mtx.synchronize do
begin
@api_client.post(url, query, header: header)
msg = @client_mtx.synchronize do
begin
@api_client.post(url, query, header: header)
@@
-143,6
+154,12
@@
class ArvadosApiClient
end
end
profile_checkpoint 'API transaction'
end
end
profile_checkpoint 'API transaction'
+ if @@profiling_enabled
+ if msg.headers['X-Runtime']
+ Rails.logger.info "API server: #{msg.headers['X-Runtime']} runtime reported"
+ end
+ Rails.logger.info "Content-Encoding #{msg.headers['Content-Encoding'].inspect}, Content-Length #{msg.headers['Content-Length'].inspect}, actual content size #{msg.content.size}"
+ end
begin
resp = Oj.load(msg.content, :symbol_keys => true)
begin
resp = Oj.load(msg.content, :symbol_keys => true)