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

Fix bug where we were not indexing Sphinx HTMLDir projects #4685

Merged
merged 2 commits into from
Sep 30, 2018
Merged

Fix bug where we were not indexing Sphinx HTMLDir projects #4685

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
65e1f56
Fix bug where we were not indexing Sphinx HTMLDir projects
ericholscher Sep 30, 2018
ffc20a2
Merge remote-tracking branch 'origin/master' into fix-search-filter
ericholscher Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readthedocs/search/documents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@ def get_queryset(self):

# Do not index files that belong to non sphinx project
# Also do not index certain files
queryset = (queryset.filter(project__documentation_type='sphinx')
queryset = (queryset.filter(project__documentation_type__contains='sphinx')
.exclude(name__in=self.excluded_files))
return queryset
2 changes: 2 additions & 0 deletions readthedocs/search/management/commands/reindex_elasticsearch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ def _run_reindex_tasks(self, models, queue):
# http://celery.readthedocs.io/en/latest/userguide/canvas.html#chords
chord_tasks = chord(header=indexing_tasks, body=post_index_task)
if queue:
pre_index_task.set(queue=queue)
chord_tasks.set(queue=queue)
missed_index_task.set(queue=queue)
# http://celery.readthedocs.io/en/latest/userguide/canvas.html#chain
chain(pre_index_task, chord_tasks, missed_index_task).apply_async(**apply_async_kwargs)

Expand Down