projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-cwl-cr-output
[arvados.git]
/
services
/
api
/
app
/
models
/
keep_disk.rb
diff --git
a/services/api/app/models/keep_disk.rb
b/services/api/app/models/keep_disk.rb
index 71ec9634908cb40656ff082de848f77feeee60ba..4623393d0caf4371dfb366b6051df0f60fd72e82 100644
(file)
--- a/
services/api/app/models/keep_disk.rb
+++ b/
services/api/app/models/keep_disk.rb
@@
-44,25
+44,19
@@
class KeepDisk < ArvadosModel
:last_read_at,
:last_write_at
].collect(&:to_s).index k
:last_read_at,
:last_write_at
].collect(&:to_s).index k
- }.merge(last_ping_at:
Time.now
))
+ }.merge(last_ping_at:
db_current_time
))
end
def service_host
end
def service_host
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_host
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_host
end
def service_port
end
def service_port
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_port
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_port
end
def service_ssl_flag
end
def service_ssl_flag
- KeepService.where(uuid: self.keep_service_uuid) do |k|
- return k.service_ssl_flag
- end
+ KeepService.find_by_uuid(self.keep_service_uuid).andand.service_ssl_flag
end
protected
end
protected