|
@@ -39,11 +39,20 @@ def zkensemble():
|
|
|
"""
|
|
"""
|
|
|
ZooKeeper Ensemble
|
|
ZooKeeper Ensemble
|
|
|
"""
|
|
"""
|
|
|
|
|
+ try:
|
|
|
|
|
+ from zookeeper.conf import CLUSTERS
|
|
|
|
|
+ clusters = CLUSTERS.get()
|
|
|
|
|
+ if clusters['default'].HOST_PORTS.get() != 'localhost:2181':
|
|
|
|
|
+ return '%s/solr' % clusters['default'].HOST_PORTS.get()
|
|
|
|
|
+ except:
|
|
|
|
|
+ pass
|
|
|
|
|
+
|
|
|
from search.conf import SOLR_URL
|
|
from search.conf import SOLR_URL
|
|
|
parsed = urlparse(SOLR_URL.get())
|
|
parsed = urlparse(SOLR_URL.get())
|
|
|
return "%s:2181/solr" % (parsed.hostname or 'localhost')
|
|
return "%s:2181/solr" % (parsed.hostname or 'localhost')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
# Unused
|
|
# Unused
|
|
|
BATCH_INDEXER_PATH = Config(
|
|
BATCH_INDEXER_PATH = Config(
|
|
|
key="batch_indexer_path",
|
|
key="batch_indexer_path",
|