cul_hydra 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8bcbc10fdf68d670dfe01746875af54bdd5c10
-  data.tar.gz: d79c8eca60c517ec40c7fd010962502b298f1154
+  metadata.gz: a6c16baa2ef730a8f4395653c3cf9019198bfc55
+  data.tar.gz: 624fc473557df969fe8b68c17bd20072c8efa511
 SHA512:
-  metadata.gz: 38dfe5a01b4b1dfa97aad20497da68419c28a0f655fb8a674abff65447b9300c95dfd0ca38ebd19a8509298d7d47ddfad5ad6bd4981d17ae3279e079c4989fe8
-  data.tar.gz: 8d1f02b7ce37cc6f4ddfe7bab87631d8031b0dc212e2c4809678114b2c5af996bc8c0e6794cfc12315edf10a094aa50aa538cfa26695d526168013c8e47d33c3
+  metadata.gz: 7f12d945a86cf19b4fb52717760f86e3eb7d5528a1bb8d0531f04648cc26d1bb06dfdf9a850674c6916237ad03056384f75a17d2a5e86d8aad87a76b7e58d029
+  data.tar.gz: 57d55f4e9f8bf8948ec96b2a2a0541352415b0b5b497ee300eb1a74da0074a715392a6402f69aca1a1ebf0c5b6085b04cc5ba233730525642b170b4743b8ca0c

data/lib/cul_hydra/indexer.rb

@@ -71,9 +71,15 @@ module Cul::Hydra::Indexer
     begin
       active_fedora_object = nil
 
-      NUM_FEDORA_RETRY_ATTEMPTS.times { |i|
+      NUM_FEDORA_RETRY_ATTEMPTS.times do |i|
         begin
           active_fedora_object = ActiveFedora::Base.find(pid, :cast => true)
+          if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
+            puts 'Object was skipped because GenericResources are being skipped and it is a GenericResource.'
+          else
+            active_fedora_object.update_index
+            puts 'done.' if verbose_output
+          end
           break
         rescue RestClient::RequestTimeout, Errno::EHOSTUNREACH => e
           remaining_attempts = (NUM_FEDORA_RETRY_ATTEMPTS-1) - i
@@ -83,20 +89,23 @@ module Cul::Hydra::Indexer
             Rails.logger.error "Error: Could not connect to fedora. (#{e.class.to_s + ': ' + e.message}).  Will retry #{remaining_attempts} more #{remaining_attempts == 1 ? 'time' : 'times'} (after a #{DELAY_BETWEEN_FEDORA_RETRY_ATTEMPTS} second delay)."
             sleep DELAY_BETWEEN_FEDORA_RETRY_ATTEMPTS
           end
+        rescue RuntimeError => e
+          if e.message.index('Circular dependency detected while autoloading')
+            # The RuntimeError 'Circular dependency detected while autoloading CLASSNAME' comes up when
+            # we're doing multithreaded indexing. The solution to this problem is to just wait a few
+            # seconds for the class to autoload and then to continue, so a retry is appropriate here.
+            sleep 5
+          else
+            # Other RuntimeErrors should be passed on
+            raise e
+          end
         end
-      }
-
-      if skip_generic_resources && active_fedora_object.is_a?(GenericResource)
-        puts 'Object was skipped because GenericResources are being skipped and it is a GenericResource.'
-      else
-        active_fedora_object.update_index
-        puts 'done.' if verbose_output
       end
     rescue SystemExit, Interrupt => e
       # Allow system interrupt (ctrl+c)
       raise e
     rescue Exception => e
-      puts "Encountered problem with #{pid}.  Skipping record.  Exception: #{e.message}"
+      puts "Encountered problem with #{pid}.  Skipping record.  Exception class: #{e.class.name}.  Message: #{e.message}"
     end
   end
 end

data/lib/cul_hydra/version.rb

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.3.8'
+    VERSION = '1.3.9'
     def self.version
       VERSION
     end

data/lib/cul_hydra/version.rb~

@@ -1,6 +1,6 @@
 module Cul
   module Hydra
-    VERSION = '1.3.7'
+    VERSION = '1.3.8'
     def self.version
       VERSION
     end

data/lib/tasks/index.rake

@@ -64,11 +64,14 @@ namespace :cul_hydra do
 
       skip_generic_resources = (ENV['skip_generic_resources'] == 'true')
       
-      ### Stop excessive ActiveFedora logging ###
-      # initialize the fedora connection if necessary
-      connection = (ActiveFedora::Base.fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials)).connection
-      # the logger accessor is private
-      (connection.api.send :logger).level = Logger::INFO
+      # Update (2016-02-22): (connection.api.send :logger) returns nil, but we aren't
+      # seeing debug level ActiveFedora logging anymore, so we should be okay without this.
+      
+      #### Stop excessive ActiveFedora logging ###
+      ## initialize the fedora connection if necessary
+      #connection = (ActiveFedora::Base.fedora_connection[0] ||= ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials)).connection
+      ## the logger accessor is private
+      #(connection.api.send :logger).level = Logger::INFO
 
       start_time = Time.now
       pids = Cul::Hydra::RisearchMembers.get_project_constituent_pids(project_pid, true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cul_hydra
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Benjamin Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight