Merge pull request #212 from mlibrary/solr_admin_timeout_ttl

Use a memoizing ttl library to reduce solr calls

Author: billdueber

Gemfile

@@ -21,6 +21,7 @@ gem "aws-sdk-s3", "~> 1.160"
 gem "content_disposition", "~> 1.0"
 gem "uppy-s3_multipart", "~> 1.2"
 
+gem "ttl_memoizeable"
 
 #####################################
 # Try to work around brokenness on

Gemfile.lock

@@ -410,6 +410,8 @@ GEM
       slop (~> 4.0)
       yell
     transproc (1.1.1)
+    ttl_memoizeable (0.4.0)
+      activesupport
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
       jquery-rails
@@ -498,6 +500,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.13)
   standard
   traject
+  ttl_memoizeable
   tzinfo-data
   uglifier (>= 1.3.0)
   uppy-s3_multipart (~> 1.2)

app/views/shared/_footer.html.erb

@@ -39,7 +39,7 @@
       Data last refreshed <%= if Dromedary::Services[:looks_like_first_upload]
                                 "never"
                               else
-                                Dromedary.collection_creation_date.strftime("%A, %B %-e, %Y")
+                                Dromedary.collection_creation_date_string
                               end
     %>.
     </p>

config/load_local_config.rb

@@ -3,11 +3,13 @@
 require_relative "../lib/med_installer/logger"
 require_relative "../lib/dromedary/services"
 require_relative "../lib/med_installer/hyp_to_bibid"
+require "ttl_memoizeable"
 
 module Dromedary
   class << self
+    extend TTLMemoizeable
     def logger
-      MedInstaller::Logger::LOGGER
+      Rails.logger || MedInstaller::Logger::LOGGER
     end
 
     # For whatever historical reasons, this uses the Ettin gem to load
@@ -26,34 +28,32 @@ def config
         ENV["RAILS_ENV"]
       else
         "development"
-      end
+            end
       @config = Dromedary::Services
     end
 
-    def hyp_to_bibid(collection: Dromedary::Services[:solr_current_collection])
-      logger.info "Trying to get hyp_to_bibid for collection #{collection}"
-      current_real_collection_name = underlying_real_collection_name(coll: collection)
-      logger.info "Real collection name identified as #{current_real_collection_name}"
-      if @recorded_real_collection_name != current_real_collection_name
-        @hyp_to_bibid = MedInstaller::HypToBibId.get_from_solr(collection: collection)
-        @recorded_real_collection_name = current_real_collection_name
-        @collection_creation_date = nil
-      end
-      @hyp_to_bibid
 
+    def hyp_to_bibid
+      collection = Dromedary::Services[:solr_current_collection]
+      Rails.logger.warn "################# Fetching HyperBib ########################"
+      MedInstaller::HypToBibId.get_from_solr(collection: collection)
     end
 
-    # @param coll [SolrCloud::Alias]
-    def underlying_real_collection_name(coll:  Dromedary::Services[:solr_current_collection])
-      return coll.name unless coll.alias?
-      underlying_real_collection_name(coll: coll.collection)
+    def collection_creation_date
+      Rails.logger.warn "################# Fetching creation date ########################"
+      collection = Dromedary::Services[:solr_current_collection]
+      if collection
+        Dromedary.compute_collection_creation_date collection.collection.name
+      else
+        "Never"
+      end
     end
 
-    def collection_creation_date(coll:  Dromedary::Services[:solr_current_collection])
-      return @collection_creation_date if defined?(@collection_creation_date) && !@collection_creation_date.nil?
+    ttl_memoized_method :hyp_to_bibid, ttl: 20.seconds
+    ttl_memoized_method :collection_creation_date, ttl: 20.seconds
 
-      real_collection_name = underlying_real_collection_name(coll: coll)
-      @collection_creation_date = compute_collection_creation_date(real_collection_name)
+    def collection_creation_date_string
+      collection_creation_date.strftime("%A, %B %-e, %Y at %H:%M:%S")
     end
 
     def compute_collection_creation_date(coll)

indexer/main_indexing_rules.rb

@@ -19,7 +19,7 @@
   provide "solr_writer.basic_auth_password", Dromedary::Services[:solr_password]
 end
 
-hyp_to_bibid = Dromedary.hyp_to_bibid(collection: Dromedary::Services[:solr_collection_to_index_into])
+hyp_to_bibid = MedInstaller::HypToBibId.get_from_solr(collection:  Dromedary::Services[:solr_collection_to_index_into])
 bibset = MiddleEnglishDictionary::Collection::BibSet.new(filename: settings["bibfile"])
 
 # Do a terrible disservice to traject and monkeypatch it to take