16718: Merge branch 'master' into 16718-group-contents-collection-versions

[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 04171bcab54772f8e28d5240047e70fc87db5649..5751c135d8f9cdd57cc3f2f3ed5d77723c7abe6c 100644 (file)
--- a/services/api/app/models/keep_disk.rb
+++ b/services/api/app/models/keep_disk.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class KeepDisk < ArvadosModel
   include HasUuid
   include KindAndEtag
@@ -44,25 +48,19 @@ class KeepDisk < ArvadosModel
                               :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).each 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).each 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).each do |k|
-      return k.service_ssl_flag
-    end
+    KeepService.find_by_uuid(self.keep_service_uuid).andand.service_ssl_flag
   end
 
   protected