[incubator-sdap-nexus] branch bug_fixes updated: remove http:// from solr hardcoded endpoint

[eamonford]

This is an automated email from the ASF dual-hosted git repository.

eamonford pushed a commit to branch bug_fixes
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git


The following commit(s) were added to refs/heads/bug_fixes by this push:
     new 0e10434  remove http:// from solr hardcoded endpoint
0e10434 is described below

commit 0e10434408c64e9717332c711366fa734807dbe4
Author: Eamon Ford <eamonf...@gmail.com>
AuthorDate: Mon Aug 10 10:41:45 2020 -0700

    remove http:// from solr hardcoded endpoint
---
 data-access/nexustiles/config/datastores.ini.default | 2 +-
 data-access/nexustiles/dao/SolrProxy.py              | 4 ++--
 data-access/tests/nexustiles_test.py                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data-access/nexustiles/config/datastores.ini.default 
b/data-access/nexustiles/config/datastores.ini.default
index 63d08af..2faae53 100644
--- a/data-access/nexustiles/config/datastores.ini.default
+++ b/data-access/nexustiles/config/datastores.ini.default
@@ -17,7 +17,7 @@ table=nexus-jpl-table
 region=us-west-2
 
 [solr]
-host=localhost:8983
+host=http://localhost:8983
 core=nexustiles
 
 [datastore]
diff --git a/data-access/nexustiles/dao/SolrProxy.py 
b/data-access/nexustiles/dao/SolrProxy.py
index bf41107..28127a7 100644
--- a/data-access/nexustiles/dao/SolrProxy.py
+++ b/data-access/nexustiles/dao/SolrProxy.py
@@ -44,7 +44,7 @@ class SolrProxy(object):
         with SOLR_CON_LOCK:
             solrcon = getattr(thread_local, 'solrcon', None)
             if solrcon is None:
-                solr_url = 'http://%s/solr/%s' % (self.solrUrl, self.solrCore)
+                solr_url = '%s/solr/%s' % (self.solrUrl, self.solrCore)
                 self.logger.info("connect to solr, url {} with option(s) = 
{}".format(solr_url, solr_kargs))
                 solrcon = pysolr.Solr(solr_url, **solr_kargs)
                 thread_local.solrcon = solrcon
@@ -665,7 +665,7 @@ class SolrProxy(object):
         return (self.convert_iso_to_datetime(date) - EPOCH).total_seconds()
 
     def ping(self):
-        solrAdminPing = 'http://%s/solr/%s/admin/ping' % (self.solrUrl, 
self.solrCore)
+        solrAdminPing = '%s/solr/%s/admin/ping' % (self.solrUrl, self.solrCore)
         try:
             r = requests.get(solrAdminPing, params={'wt': 'json'})
             results = json.loads(r.text)
diff --git a/data-access/tests/nexustiles_test.py 
b/data-access/tests/nexustiles_test.py
index 9f533a8..d79d441 100644
--- a/data-access/tests/nexustiles_test.py
+++ b/data-access/tests/nexustiles_test.py
@@ -32,7 +32,7 @@ protocol_version=3
 port=9042
 
 [solr]
-host=localhost:8983
+host=http://localhost:8983
 core=nexustiles
 
 [datastore]