Merge branch 'master' into 2767-doc-updates

[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..da421ebb4cb92f13369a4517ef80583642d54844 100644 (file)
--- a/services/api/app/models/keep_disk.rb
+++ b/services/api/app/models/keep_disk.rb
@@ -48,21 +48,15 @@ class KeepDisk < ArvadosModel
   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