Merge branch 'master' into github-3408-production-datamanager

[arvados.git] / services / api / app / models / collection.rb

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index f7822ec070c1f6d0946e6aefb664a31abf5dd3b9..cac25d1c537981a433db526f730957f943c0d487 100644 (file)
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -9,7 +9,7 @@ class Collection < ArvadosModel
   serialize :properties, Hash
 
   before_validation :check_encoding
-  before_validation :check_manifest_validity
+  before_validation :log_invalid_manifest_format
   before_validation :check_signatures
   before_validation :strip_signatures_and_update_replication_confirmed
   validate :ensure_pdh_matches_manifest_text
@@ -193,7 +193,7 @@ class Collection < ArvadosModel
     end
   end
 
-  def check_manifest_validity
+  def log_invalid_manifest_format
     begin
       Keep::Manifest.validate! manifest_text if manifest_text
     rescue => e