CodeMirror/ArchiveBox
1
0
Fork 0
mirror of synced 2024-06-02 10:34:43 +12:00
Code Issues Projects Releases Wiki Activity

dont prevent search when backend throws an exception or times out

Browse source
This commit is contained in:
Nick Sweeting 2021-04-10 08:18:13 -04:00
parent 9f05cf8283
commit 52429b8d15
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
archivebox/core/mixins.py
View file

@ -15,6 +15,7 @@ class SearchResultsAdminMixin:
qsearch = query_search_index(search_term) qsearch = query_search_index(search_term)
qs = qs | qsearch qs = qs | qsearch
except Exception as err: except Exception as err:
print(f'[!] Error while using search backend: {err.__class__.__name__} {err}')
messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}') messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}')
return qs, use_distinct return qs, use_distinct

5
archivebox/core/views.py
View file

@ -223,7 +223,10 @@ class PublicIndexView(ListView):
query = self.request.GET.get('q') query = self.request.GET.get('q')
if query and query.strip(): if query and query.strip():
qs = qs.filter(Q(title__icontains=query) | Q(url__icontains=query) | Q(timestamp__icontains=query) | Q(tags__name__icontains=query)) qs = qs.filter(Q(title__icontains=query) | Q(url__icontains=query) | Q(timestamp__icontains=query) | Q(tags__name__icontains=query))
qs = qs | query_search_index(query) try:
qs = qs | query_search_index(query)
except Exception as err:
print(f'[!] Error while using search backend: {err.__class__.__name__} {err}')
return qs return qs
def get(self, *args, **kwargs): def get(self, *args, **kwargs):