From c329f7e6b503e6077a7af9bad1a360b9318557b7 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 2 Jul 2015 17:22:55 +0100 Subject: [PATCH] Remove es_urls attribute from ElasticsearchBackend This gets converted into es_hosts and es_urls isn't used at runtime --- wagtail/wagtailsearch/backends/elasticsearch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 77338c49a4..340bed4afd 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -313,15 +313,15 @@ class ElasticSearch(BaseSearch): # Get settings self.es_hosts = params.pop('HOSTS', None) - self.es_urls = params.pop('URLS', ['http://localhost:9200']) self.es_index = params.pop('INDEX', 'wagtail') self.es_timeout = params.pop('TIMEOUT', 10) # If HOSTS is not set, convert URLS setting to HOSTS + es_urls = params.pop('URLS', ['http://localhost:9200']) if self.es_hosts is None: self.es_hosts = [] - for url in self.es_urls: + for url in es_urls: parsed_url = urlparse(url) use_ssl = parsed_url.scheme == 'https'