From 45d8db71a0dc88bf554cb9210dbf1d701fa01628 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 7 Dec 2015 13:29:02 +0000 Subject: [PATCH] refactor(search/elastic): Rebuilders now take index in __init__ --- wagtail/wagtailsearch/backends/elasticsearch.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 98cc65a4d..56d48ae95 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -458,9 +458,9 @@ class ElasticSearchResults(BaseSearchResults): class ElasticSearchIndexRebuilder(object): - def __init__(self, es, index_name): - self.es = es - self.index_name = index_name + def __init__(self, index): + self.es = index.es + self.index_name = index.es_index def reset_index(self): # Delete old index @@ -514,10 +514,10 @@ class ElasticSearchIndexRebuilder(object): class ElasticSearchAtomicIndexRebuilder(ElasticSearchIndexRebuilder): - def __init__(self, es, alias_name): - self.es = es - self.alias_name = alias_name - self.index_name = alias_name + '_' + get_random_string(7).lower() + def __init__(self, index): + self.es = index.es + self.alias_name = index.es_index + self.index_name = self.alias_name + '_' + get_random_string(7).lower() def reset_index(self): # Delete old index using the alias @@ -619,7 +619,7 @@ class ElasticSearch(BaseSearch): **params) def get_rebuilder(self): - return self.rebuilder_class(self.es, self.es_index) + return self.rebuilder_class(self) def reset_index(self): # Use the rebuilder to reset the index