From b34d1130ed9de1fc9194e5b736cb650205a55e56 Mon Sep 17 00:00:00 2001
From: RhodeCode Admin <admin@rhodecode.com>
Date: Tue, 5 Aug 2025 10:15:26 +0200
Subject: [PATCH] fix: added error handling to ES search

---
 rhodecode/apps/admin/views/settings.py              |  8 +++++++-
 .../templates/admin/settings/settings_search.mako   | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/rhodecode/apps/admin/views/settings.py b/rhodecode/apps/admin/views/settings.py
index cf201346..f49eedca 100644
--- a/rhodecode/apps/admin/views/settings.py
+++ b/rhodecode/apps/admin/views/settings.py
@@ -587,8 +587,14 @@ class AdminSettingsView(BaseAppView):
         c.active = "search"
 
         c.searcher = searcher_from_config(self.request.registry.settings)
-        c.statistics = c.searcher.statistics(self.request.translate)
+        c.error = None
+        c.statistics = None
 
+        try:
+            c.statistics = c.searcher.statistics(self.request.translate)
+        except Exception as e:
+            log.exception("Exception during search statistics retrieval")
+            c.error = e
         return self._get_template_context(c)
 
     @LoginRequired()
diff --git a/rhodecode/templates/admin/settings/settings_search.mako b/rhodecode/templates/admin/settings/settings_search.mako
index c447d405..357ae7f0 100644
--- a/rhodecode/templates/admin/settings/settings_search.mako
+++ b/rhodecode/templates/admin/settings/settings_search.mako
@@ -4,6 +4,7 @@
     </div>
     <div class="panel-body">
         <dl class="dl-horizontal">
+        % if c.statistics:
           % for stat in c.statistics:
               % if stat.get('sep'):
                   <dt></dt>
@@ -13,6 +14,18 @@
                   <dd>${stat['value']}</dd>
               % endif
           % endfor
+        % endif
+
+        % if c.error:
+            <div class="panel panel-danger">
+                <div class="panel-heading">
+                    <h3 class="panel-title">${_('ERROR')}</h3>
+                </div>
+                <div class="panel-body">
+                ${c.error}
+                </div>
+            </div>
+        % endif
         </dl>
     </div>
 </div>