[open-ils-commits] [GIT] Evergreen ILS branch master updated. 634a0db6a5f7970d842b7bb1017f68da2f23317d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  634a0db6a5f7970d842b7bb1017f68da2f23317d (commit)
      from  c028f45c4fedcd6837fa1d685d620c6e405240b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 634a0db6a5f7970d842b7bb1017f68da2f23317d
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jan 19 17:01:22 2012 -0500

    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 at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at 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 eb166a6..6368787 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=".

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Search/Biblio.pm       |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS