Merge pull request #70 from hinling-whistle/DEVOPS-1997

[DEVOPS-1997] -- add key to error message
unifio · Sep 25, 2018 · 2f1d741 · 2f1d741
2 parents b5b7997 + a2d4ffe
commit 2f1d741
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/covalence/core/state_stores/s3.rb b/lib/covalence/core/state_stores/s3.rb
@@ -34,12 +34,16 @@ def get_doc(bucket, document)
         @cache[bucket][document] ||= begin
           @s3.get_object(bucket: bucket, key: document).body.read
         rescue Aws::S3::Errors::ServiceError => err
-          fail "Unable to retrieve document '#{document}' from bucket '#{bucket}': " + err.message
+          raise err, "Unable to retrieve document '#{document}' from bucket '#{bucket}'"
         end
       end
 
       def get_key(bucket, document, name)
-        doc = self.get_doc(bucket, document)
+        begin
+          doc = self.get_doc(bucket, document)
+        rescue Aws::S3::Errors::ServiceError => err
+          fail err.message + " and the key is: #{name}. Check your data files."
+        end
 
         # Parse JSON response
         begin