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

Also try and fix a bug with queue selection around reindexing.

Author: ericholscher

readthedocs/search/documents.py

@@ -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

readthedocs/search/management/commands/reindex_elasticsearch.py

@@ -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)