less details; extend Exception

ckan · Apr 24, 2024 · f9bd198 · f9bd198
1 parent 85bda1a
commit f9bd198
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ckan/lib/search/common.py b/ckan/lib/search/common.py
@@ -4,7 +4,6 @@
 import datetime
 import logging
 import re
-from urllib3.exceptions import NewConnectionError
 from typing import Any, Optional
 
 import pysolr
@@ -30,7 +29,7 @@ class SearchQueryError(SearchError):
     pass
 
 
-class SolrConnectionError(NewConnectionError):
+class SolrConnectionError(Exception):
     pass
 
 

diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py
@@ -470,7 +470,8 @@ def _check_query_parser(param: str, value: Any):
                     raise SearchQueryError('Invalid "sort" parameter')
 
                 if "Failed to connect to server" in e.args[0]:
-                    raise SolrConnectionError("Connection Error", message="Failed to connect to Solr server")
+                    log.warning("Connection Error: Failed to connect to Solr server.")
+                    raise SolrConnectionError("Solr returned an error while searching.")
 
             raise SearchError('SOLR returned an error running query: %r Error: %r' %
                               (query, e))