[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. c3c37595218672b8b623ce8a38de4675b7807231

[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, rel_2_1 has been updated
       via  c3c37595218672b8b623ce8a38de4675b7807231 (commit)
      from  c72d7d33a6c5721098665c296b6eff837a6d750e (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 c3c37595218672b8b623ce8a38de4675b7807231
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 ff82f86..a72ee56 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