From: Jason Etheridge <jason@esilibrary.com>
Date: Thu, 19 Jan 2012 22:01:22 +0000 (-0500)
Subject: Handle search timeouts more gracefully
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=634a0db6a5f7970d842b7bb1017f68da2f23317d;p=evergreen%2Ftadl.git

Handle search timeouts more gracefully

Another tweak courtesy of berick

Returns 0 results if open-ils.storage timeouts instead of a nasty uncaught
undefined ARRAY exception resulting in an OPAC "spinning wheel of death"
(formerly the "green knight rider bar of death".

Note that in the event of storage timeouts, you should tune and/or beef-up
your database.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
index eb166a6318..63687878bc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm
@@ -1270,7 +1270,6 @@ sub staged_search {
             my $start = time;
             $results = $U->storagereq($method, %$search_hash);
             $search_duration = time - $start;
-            $logger->info("staged search: DB call took $search_duration seconds and returned ".scalar(@$results)." rows, including summary");
             $summary = shift(@$results) if $results;
 
             unless($summary) {
@@ -1279,6 +1278,8 @@ sub staged_search {
                 return {count => 0};
             }
 
+            $logger->info("staged search: DB call took $search_duration seconds and returned ".scalar(@$results)." rows, including summary");
+
             my $hc = $summary->{estimated_hit_count} || $summary->{visible};
             if($hc == 0) {
                 $logger->info("search returned 0 results: duration=$search_duration: params=".