Merge pull request #687 from IU-Libraries-Joint-Development/essi-2119_more_error_logging

[ESSI-2119] more error logging

Author: aploshay

app/models/archival_material.rb

@@ -8,6 +8,8 @@ class ArchivalMaterial < ActiveFedora::Base
   include ESSI::OCRBehavior
   include ESSI::PDFBehavior
   include ESSI::PDFDefaultDownloadable
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = ArchivalMaterialIndexer
   # Change this to restrict which works can be added as a child.

app/models/bib_record.rb

@@ -6,6 +6,8 @@ class BibRecord < ActiveFedora::Base
   include ExtraLockable
   include ESSI::NumPagesBehavior
   include ESSI::OCRBehavior
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = BibRecordIndexer
   # Change this to restrict which works can be added as a child.

app/models/collection.rb

@@ -6,6 +6,8 @@ class Collection < ActiveFedora::Base
   include ::ESSI::CollectionBehavior
   # You can replace these metadata if they're not suitable
   include Hyrax::BasicMetadata
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = ESSI::CollectionIndexer
 

app/models/concerns/essi/ordered_members_nil_values.rb

@@ -0,0 +1,11 @@
+module ESSI
+  module OrderedMembersNilValues
+    extend ActiveSupport::Concern
+
+    def ordered_members
+      result = super
+      Rails.logger.error("Nil values present in ordered_members of #{self.class.to_s} #{self.id}") if result.to_a.any?(&:nil?)
+      result
+    end
+  end
+end

app/models/concerns/essi/solr_error_behavior.rb

@@ -0,0 +1,14 @@
+module ESSI
+  module SolrErrorBehavior
+    extend ActiveSupport::Concern
+
+    def to_solr(solr_doc = {})
+      begin
+        super
+      rescue => e
+        Rails.logger.error("Error in #to_solr for #{self.class.to_s} #{self.id}: #{e.inspect}")
+        raise e
+      end
+    end
+  end
+end

app/models/file_set.rb

@@ -3,6 +3,8 @@ class FileSet < ActiveFedora::Base
   include ESSI::FileSetMetadata
   include ESSI::RemoteLookupMetadata
   include ::Hyrax::FileSetBehavior
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   directly_contains_one :preservation_master_file, through: :files, type: ::RDF::URI('http://pcdm.org/use#PreservationMasterFile'), class_name: 'Hydra::PCDM::File'
 

app/models/image.rb

@@ -6,6 +6,8 @@ class Image < ActiveFedora::Base
   include ExtraLockable
   include ESSI::NumPagesBehavior
   include ESSI::OCRBehavior
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = ImageIndexer
   # Change this to restrict which works can be added as a child.

app/models/paged_resource.rb

@@ -7,6 +7,8 @@ class PagedResource < ActiveFedora::Base
   include ESSI::NumPagesBehavior
   include ESSI::OCRBehavior
   include ESSI::PDFBehavior
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = PagedResourceIndexer
   # Change this to restrict which works can be added as a child.

app/models/scientific.rb

@@ -6,6 +6,8 @@ class Scientific < ActiveFedora::Base
   include ExtraLockable
   include ESSI::NumPagesBehavior
   include ESSI::OCRBehavior
+  include ESSI::SolrErrorBehavior
+  include ESSI::OrderedMembersNilValues
 
   self.indexer = ScientificIndexer
   # Change this to restrict which works can be added as a child.