umlaut_borrow_direct 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjlkY2Y1ODU0Zjg0MWNlZWY2MjUzNTFhZmU5ODgyM2QwZDYyYTg1NQ==
+    OTBlNGIxNjQxMWMzZTM3YzEyMTJmOTBlN2UyMjRhMWI2ZWY4NDU5Ng==
   data.tar.gz: !binary |-
-    NWFlZDVkNTRhMmZhYTI4YmY0NWRhZWViY2EyYmE3YjU0MWE3ZTNhNw==
+    MTYxZmRlMDkxYWIwMzg4ZjllMWQyNWIyZmE5NWFiNzczODIyOWEyYg==
 SHA512:
   metadata.gz: !binary |-
-    ZjNlYzhlMWFkYWViZTAwOTkzNGFlOWFhOGY1ZmE4OTBjMGY3OTQ5YmY5OWIy
-    MGU2OGE2YTg1ZTZlN2MyZmExMGQxNzZkZDI1NWZiMmRlNDc4ZTBjY2U0YTlk
-    NzFkYzk5ODEwOGNkYTE0NzQ2ZTRkZTUyNDcxNWUyYzZjNDJlNWQ=
+    MGU4MDczNWUxMTQ2M2E4ZTk0ZDMyMzlkY2VlZTY5MjViMWNhNjQwYWMzYjEw
+    OTVhYmMyMjQ5ODg3YjM1MDg2OTUzZTg2ZDFmNThlNmI2YzljOThjNDM4MWE5
+    MzNlOGI5NGEwNjlkNjVjMzE5ZTFkMjljYTk1ZTdjZjQwYTRhYTc=
   data.tar.gz: !binary |-
-    NjQyZmM5ZmE5NjM0ODBhYjVmNTIwNTgwYjBlMGE1OWU0OTIyZWM3ODZkMjQz
-    ZTM1MzQyMmQ2MTZjYTFjMWY2MjYyOTUxMWRjNTgzY2E3ZmZjMDAwN2NhODBm
-    M2UyZWM1YmMyNGMyYjg5MTVjMDM2MGU4ZGUzY2MzNWVhY2FkZGY=
+    OTVlMmFhMmQxYTBmZmExMzk2MTNkZGE3MmZmZWMwNDlkODg0MWFhOTY3YWQ0
+    MTM3ZDkzOTRmMmY0MGIxZTQ2YjI5NWE2NDE4NWU3M2NlODMyZGQzMDkzMjU1
+    Y2MwNDBhOTcwMzgzNDYwN2Q4ZDMwZTI5ZDJkMmIyZGZmYTQ5M2M=

data/app/controllers/umlaut_borrow_direct/controller_implementation.rb

@@ -44,6 +44,7 @@ module UmlautBorrowDirect
       # Saving the @bg_thread only so in testing we can wait on it. 
       @bg_thread = Thread.new(@request, @service, @request.referent.isbn) do |request, service, isbn|
         begin
+          ActiveRecord::Base.forbid_implicit_checkout_for_thread!
 
           requester = BorrowDirect::RequestItem.new(self.patron_barcode, service.library_symbol)
           requester.timeout = @service.http_timeout
@@ -56,7 +57,17 @@ module UmlautBorrowDirect
             set_status_response({:status => Successful, :request_number => request_number }, request)
           end
 
-        rescue StandardError => e          
+        rescue StandardError => e
+          # If it was an AR error in the first place, forget trying to record
+          # it. 
+          if e.kind_of?(ActiveRecord::ActiveRecordError)
+            Rails.logger.fatal("BorrowDirect: Error placing request, and we could not log to database (#{e}):  #{e.class} #{e.message}. Backtrace:\n  #{Umlaut::Util.clean_backtrace(e).join("\n  ")}\n")
+
+            # Nothing will do anything with this since we aren't waiting on
+            # the thread, but oh well. 
+            raise e
+          end
+
           ActiveRecord::Base.connection_pool.with_connection do
             Rails.logger.error("BorrowDirect: Error placing request:  #{e.class} #{e.message}. Backtrace:\n  #{Umlaut::Util.clean_backtrace(e).join("\n  ")}\n")
 
@@ -68,7 +79,7 @@ module UmlautBorrowDirect
             set_status_response(status_response_data, request)
 
             if service
-              service.bd_api_log(isbn, "RequestItem", e, requester.last_request_time)
+              service.bd_api_log(isbn, "RequestItem", e, (requester.last_request_time if requester))
             end
 
 

data/app/service_adaptors/borrow_direct_adaptor.rb

@@ -47,6 +47,11 @@ class BorrowDirectAdaptor < Service
     return ! title_is_serial?(request.referent)
   end
 
+  # Make sure there are no hyphens, BD doesn't seem to like it
+  def isbn(request)
+    request.referent.isbn && request.referent.isbn.gsub('-', '')
+  end
+
   def handle(request)
     if request.referrer_id && @suppress_rfr_ids.include?(request.referrer_id)
       return request.dispatched(self, true)
@@ -70,10 +75,10 @@ class BorrowDirectAdaptor < Service
       begin
         finditem = BorrowDirect::FindItem.new(@find_item_patron_barcode, @library_symbol)
         finditem.timeout = @http_timeout
-        response = finditem.find(:isbn => request.referent.isbn)
+        response = finditem.find(:isbn => isbn(request))
 
         # Log success if configured, used for looking at error rate
-        bd_api_log(request.referent.isbn, "FindItem", "SUCCESS", finditem.last_request_time)
+        bd_api_log(isbn(request), "FindItem", "SUCCESS", finditem.last_request_time)
 
         if response.requestable?
           # Mark it requestable!
@@ -100,7 +105,7 @@ class BorrowDirectAdaptor < Service
         Rails.logger.error(msg)
 
         # Special BD error log if configured
-        bd_api_log(request.referent.isbn, "FindItem", e, finditem.last_request_time)
+        bd_api_log(isbn(request), "FindItem", e, finditem.last_request_time)
 
         # And mark it as an error so error message will be displayed. Let's
         # mark it a temporary error, so it'll be tried again later, it might
@@ -123,12 +128,15 @@ class BorrowDirectAdaptor < Service
   def can_precheck_borrow_direct?(request)
     return false unless @use_bd_api
 
-    request.referent.isbn.present?
+    isbn(request).present?
   end
 
   def bd_api_log(isbn, action, result, timing)
     if result.kind_of? Exception
       result = "#{result.class}/#{result.message}"
+      if result.respond_to?(:bd_code) && result.bd_code.present?
+        result += "/#{result.bd_code}"
+      end
     end
 
     if @bd_api_log_level

data/lib/tasks/umlaut_borrow_direct_tasks.rake

@@ -2,3 +2,119 @@
 # task :umlaut_borrow_direct do
 #   # Task goes here
 # end
+namespace :umlaut_borrow_direct do
+  desc "BD API stats calc"
+  task :api_stats, [:filename] do |t, args|
+
+    stats = {
+      "FindItem" => {
+        :times    => [],
+        :errors   => [],
+        :timeouts => [],
+        :count    => 0
+      },
+      "RequestItem" => {
+        :times    => [],
+        :errors   => [],
+        :timeouts => [],
+        :count    => 0
+      }
+    }
+
+    if args["filename"] == "stdin"
+      file = STDIN
+    else
+      file = File.open(File.expand_path args[:filename])
+    end
+
+    file.each_line do |line|
+
+      if line =~ /BD API log\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)/
+        action = $1
+        result = $2
+        timing = $3
+        query  = $4
+        
+        if timing.present? && (timing.to_f == 0)
+          raise "Timing does not look like a float: #{timingf}" 
+        end
+        timing = timing.to_f
+
+        if ["FindItem", "RequestItem"].include? action
+          stats[action][:count] += 1
+
+          if line =~ /(\d\d\d\d-\d\d-\d\d)/
+
+            date = Date.parse($1)
+
+            stats[action][:min_date] = date if stats[action][:min_date].nil? || (date < stats[action][:min_date])
+            stats[action][:max_date] = date if stats[action][:max_date].nil? || (date > stats[action][:max_date])
+          end
+
+          value_dict = {:action => action, :result => result, :timing => timing, :query => query}
+
+          stats[action][:times] << timing unless timing == 0
+          unless result == "SUCCESS"
+            (exception_class, exception_message) = result.split("/")
+            value_dict[:exception_class]   = exception_class
+            value_dict[:exception_message] = exception_message
+            if exception_class == "BorrowDirect::HttpTimeoutError"          
+              stats[action][:timeouts] << value_dict 
+            else
+              stats[action][:errors] << value_dict
+            end
+          end
+        else
+          puts "Warning, unrecognized action: #{action}"
+        end
+      end
+    end
+
+    ["FindItem", "RequestItem"].each do |action|
+      sorted_times = stats[action][:times].sort
+
+      next if sorted_times.empty?
+      
+      puts "\n\n#{action} API: #{stats[action][:count]} requests from #{stats[action][:min_date]} to #{stats[action][:max_date]}"
+      puts "  Timing (not including timeouts):"
+      puts "    Min: #{sorted_times.first}"
+      puts "    25th %ile: #{percentile sorted_times, 25}"
+      puts "    Median: #{percentile sorted_times, 50}"
+      puts "    75th %ile: #{percentile sorted_times, 75}"
+      puts "    95th %ile: #{percentile sorted_times, 95}"
+      puts "    Max: #{sorted_times.last}"
+      puts ""
+      puts "  Timeouts: #{stats[action][:timeouts].count}"
+      puts "  Errors: #{stats[action][:errors].count}"
+
+      #error_types = stats[action][:errors].group_by {|dict| dict[:exception_class]}
+      #error_types.each_pair do |type, list|
+      #  puts "    #{type} (#{list.count}) #{list}"
+      #end
+
+    end
+    puts "\n\n"
+    
+    
+  end
+
+  # pass in a SORTED array a
+  def percentile a, p
+      rank = (p.to_f / 100) * (a.length + 1)
+      
+      if a.length == 0
+        return nil
+      elsif rank.modulo(1) != 0
+
+
+        sample_0 = a[rank.truncate - 1]
+        sample_1 = a[rank.truncate]
+
+
+        return sample_0 if sample_1.nil?
+        return (sample_1 + sample_0) / 2
+      else
+        return a[rank - 1]
+      end    
+  end
+end

data/lib/umlaut_borrow_direct/version.rb

@@ -1,3 +1,3 @@
 module UmlautBorrowDirect
-  VERSION = "1.0.0.pre2"
+  VERSION = "1.0.0.pre3"
 end