From 2b312be4964731e92d75bcad5c7cba1627a1328c Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Thu, 19 Jan 2012 17:01:22 -0500 Subject: [PATCH] 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 --- Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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=". -- 2.11.0