Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-10 01:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(search/elastic): Rebuilders now take index in __init__

Browse source
This commit is contained in:
Karl Hobley 2015-12-07 13:29:02 +00:00 committed by Matt Westcott
parent 3e218c4f96
commit 45d8db71a0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wagtail/wagtailsearch/backends/elasticsearch.py
View file

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