From cc8787bf879630f1c5572008c3637598f56d7aff Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 1 Apr 2021 13:49:19 +0000
Subject: [PATCH] Bug 26312: (follow-up) Fix passing of exception messages
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

'error' has special meaning in exceptions so naming the fields:
type, details

Rather than only dealing with a single exception type, we generically
get the ES exception info and pass it up.

I could not recreate timeout still, however, I simply restarted the
ES docker during commit stage to cause NoNodes exceptions

Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 Koha/Exceptions/Elasticsearch.pm           | 2 +-
 Koha/SearchEngine/Elasticsearch/Indexer.pm | 6 ++----
 misc/search_tools/rebuild_elasticsearch.pl | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Koha/Exceptions/Elasticsearch.pm b/Koha/Exceptions/Elasticsearch.pm
index 7ad8538069..2068db9fda 100644
--- a/Koha/Exceptions/Elasticsearch.pm
+++ b/Koha/Exceptions/Elasticsearch.pm
@@ -25,7 +25,7 @@ use Exception::Class (
     'Koha::Exceptions::Elasticsearch::BadResponse' => {
         isa         => 'Koha::Exceptions::Elasticsearch',
         description => 'Bad response received when submitting request to Elasticsearch',
-        fields      => [ 'error', 'details' ]
+        fields      => [ 'type', 'details' ]
     },
     'Koha::Exceptions::Elasticsearch::MARCFieldExprParseError' => {
         isa         => 'Koha::Exceptions::Elasticsearch',
diff --git a/Koha/SearchEngine/Elasticsearch/Indexer.pm b/Koha/SearchEngine/Elasticsearch/Indexer.pm
index 43c2c8d193..0c9b3ff380 100644
--- a/Koha/SearchEngine/Elasticsearch/Indexer.pm
+++ b/Koha/SearchEngine/Elasticsearch/Indexer.pm
@@ -125,12 +125,10 @@ sub update_index {
                 carp "One or more ElasticSearch errors occurred when indexing documents";
             }
         } catch {
-            if( ref $_ eq 'Search::Elasticsearch::Error::Timeout' ){
             Koha::Exceptions::Elasticsearch::BadResponse->throw(
-                error => "Record commit failed.",
-                details => "Timeout",
+                type => $_->{type},
+                details => $_->{text},
             );
-            }
         };
     }
     return $response;
diff --git a/misc/search_tools/rebuild_elasticsearch.pl b/misc/search_tools/rebuild_elasticsearch.pl
index 19839ff6da..3b25709a76 100755
--- a/misc/search_tools/rebuild_elasticsearch.pl
+++ b/misc/search_tools/rebuild_elasticsearch.pl
@@ -309,10 +309,8 @@ sub _do_reindex {
                 _handle_response($response);
                 _log( 1, "Commit complete\n" );
             } catch {
-                if( ref $_ eq 'Koha::Exceptions::Elasticsearch::BadResponse'){
-                    _log(1,$_->{error});
-                    _log(2,$_->{details});
-                }
+                _log(1,"Elasticsearch exception thrown: ".$_->type."\n");
+                _log(2,"Details: ".$_->details."\n");
             };
             $commit_count  = $commit;
             @id_buffer     = ();
-- 
2.39.5