Browse Source

[libzookeeper] Do not append Solr port to the default ZooKeeper ensemble

Romain Rigaux 10 years ago
parent
commit
c7052a2
1 changed files with 4 additions and 4 deletions
  1. 4 4
      desktop/libs/libzookeeper/src/libzookeeper/conf.py

+ 4 - 4
desktop/libs/libzookeeper/src/libzookeeper/conf.py

@@ -34,16 +34,16 @@ def zkensemble():
     from zookeeper.conf import CLUSTERS
     clusters = CLUSTERS.get()
     if clusters['default'].HOST_PORTS.get() != 'localhost:2181':
-      return '%s/solr' % clusters['default'].HOST_PORTS.get()
+      return '%s' % clusters['default'].HOST_PORTS.get()
   except:
-    LOG.exception('failed to get zookeeper ensemble')
+    LOG.warn('Could not get zookeeper ensemble from the zookeeper app')
 
   try:
     from search.conf import SOLR_URL
     parsed = urlparse(SOLR_URL.get())
-    return "%s:2181/solr" % (parsed.hostname or 'localhost')
+    return "%s:2181" % (parsed.hostname or 'localhost')
   except:
-    LOG.exception('failed to get solr url')
+    LOG.warn('Could not get zookeeper ensemble from the search app')
 
   return "localhost:2181"