projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14197-federated-containers' refs #14197
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index ba7c07d27266f26ef3bcdbcfc01940d406cec9b1..8589b3c7a55f366fb5668884d71aac40139bea7f 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-78,14
+78,21
@@
class ApplicationController < ActionController::Base
@distinct = nil
@response_resource_name = nil
@attrs = nil
@distinct = nil
@response_resource_name = nil
@attrs = nil
+ @extra_included = nil
end
def default_url_options
end
def default_url_options
+ options = {}
if Rails.configuration.host
if Rails.configuration.host
- {:host => Rails.configuration.host}
- else
- {}
+ options[:host] = Rails.configuration.host
+ end
+ if Rails.configuration.port
+ options[:port] = Rails.configuration.port
end
end
+ if Rails.configuration.protocol
+ options[:protocol] = Rails.configuration.protocol
+ end
+ options
end
def index
end
def index
@@
-382,7
+389,9
@@
class ApplicationController < ActionController::Base
req_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
end
response.headers['X-Request-Id'] = Thread.current[:request_id] = req_id
req_id = "req-" + Random::DEFAULT.rand(2**128).to_s(36)[0..19]
end
response.headers['X-Request-Id'] = Thread.current[:request_id] = req_id
- yield
+ Rails.logger.tagged(req_id) do
+ yield
+ end
Thread.current[:request_id] = nil
end
Thread.current[:request_id] = nil
end
@@
-492,6
+501,9
@@
class ApplicationController < ActionController::Base
:limit => @limit,
:items => @objects.as_api_response(nil, {select: @select})
}
:limit => @limit,
:items => @objects.as_api_response(nil, {select: @select})
}
+ if @extra_included
+ list[:included] = @extra_included.as_api_response(nil, {select: @select})
+ end
case params[:count]
when nil, '', 'exact'
if @objects.respond_to? :except
case params[:count]
when nil, '', 'exact'
if @objects.respond_to? :except
@@
-551,7
+563,13
@@
class ApplicationController < ActionController::Base
location: "query",
required: false,
default: false
location: "query",
required: false,
default: false
- }
+ },
+ cluster_id: {
+ type: 'string',
+ description: "Create object on a remote federated cluster instead of the current one.",
+ location: "query",
+ required: false,
+ },
}
end
}
end