Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Less details in Solr connection error message #8196

Merged
merged 2 commits into from
May 3, 2024
Merged

Less details in Solr connection error message #8196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85bda1a
connection error message less details
FuhuXia Apr 24, 2024
f9bd198
less details; extend Exception
FuhuXia Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ckan/lib/search/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import datetime
import logging
import re
from urllib3.exceptions import NewConnectionError
from typing import Any, Optional

import pysolr
Expand All @@ -30,7 +29,7 @@ class SearchQueryError(SearchError):
pass


class SolrConnectionError(NewConnectionError):
class SolrConnectionError(Exception):
pass


Expand Down
3 changes: 2 additions & 1 deletion ckan/lib/search/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=e.args[0])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get the details logged with a log.warning(e.args[0])? This might help maintainers debug the actual issue

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes were made so that
Site Visitors sees "Solr returned an error while searching.",
Site Maintainers sees "Connection Error: 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))
Expand Down