[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 06ad5407984b528cedf9eeddbec50072981a6921

[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_0 has been updated
       via  06ad5407984b528cedf9eeddbec50072981a6921 (commit)
      from  082b33695ff60fa2b9105db4fc7070d5470866d7 (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 06ad5407984b528cedf9eeddbec50072981a6921
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/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
index 005eb01..80b418f 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Biblio.pm
@@ -1166,7 +1166,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) {
@@ -1175,6 +1174,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:
 .../perlmods/OpenILS/Application/Search/Biblio.pm  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS