projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 8554-trash-untrash-unix-volume
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
nodes_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/nodes_controller.rb
b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index fc3384b9c285c965034b824430965820c2b04e74..5e2404e62c4db63360ddf91f5a6f1c801c763ce3 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/nodes_controller.rb
@@
-3,6
+3,8
@@
class Arvados::V1::NodesController < ApplicationController
skip_before_filter :find_object_by_uuid, :only => :ping
skip_before_filter :render_404_if_no_object, :only => :ping
skip_before_filter :find_object_by_uuid, :only => :ping
skip_before_filter :render_404_if_no_object, :only => :ping
+ include DbCurrentTime
+
def update
if resource_attrs[:job_uuid]
@object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
def update
if resource_attrs[:job_uuid]
@object.job_readable = readable_job_uuids(resource_attrs[:job_uuid]).any?
@@
-21,7
+23,7
@@
class Arvados::V1::NodesController < ApplicationController
return render_not_found
end
ping_data = {
return render_not_found
end
ping_data = {
- ip: params[:local_ipv4] || request.
env['REMOTE_ADDR']
,
+ ip: params[:local_ipv4] || request.
remote_ip
,
ec2_instance_id: params[:instance_id]
}
[:ping_secret, :total_cpu_cores, :total_ram_mb, :total_scratch_mb]
ec2_instance_id: params[:instance_id]
}
[:ping_secret, :total_cpu_cores, :total_ram_mb, :total_scratch_mb]