11345: Clamp retry-after to (0, max_retry_wait). Deindent retry_wrapper a bit for...

[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 612696b89b5d611bb9a157ee00b6c3608bc10973..4623393d0caf4371dfb366b6051df0f60fd72e82 100644 (file)
--- a/services/api/app/models/keep_disk.rb
+++ b/services/api/app/models/keep_disk.rb
@@ -37,35 +37,26 @@ class KeepDisk < ArvadosModel
 
     @bypass_arvados_authorization = true
     self.update_attributes!(o.select { |k,v|
-                             [:service_host,
-                              :service_port,
-                              :service_ssl_flag,
-                              :bytes_total,
+                             [:bytes_total,
                               :bytes_free,
                               :is_readable,
                               :is_writable,
                               :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
-    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
-    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
-    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