CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added if statment

This commit is contained in:
filip.mihajlovski 2022-03-15 15:25:52 +01:00
parent 8dfd01c5f4
commit e1da27038c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
images/ckan/2.9/setup/app/prerun.py
View File

@ -11,6 +11,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
from multiprocessing import connection
import os import os
import sys import sys
import subprocess import subprocess
@ -66,7 +67,7 @@ def check_solr_connection(retry=None):
print('[prerun] Giving up after 5 tries...') print('[prerun] Giving up after 5 tries...')
sys.exit(1) sys.exit(1)
url = os.environ.get('CKAN_SOLR_URL_AUTH', '') url = os.environ.get('CKAN_SOLR_URL', '')
username = os.environ.get('SOLR_ADMIN_USERNAME', '') username = os.environ.get('SOLR_ADMIN_USERNAME', '')
password = os.environ.get('SOLR_ADMIN_PASSWORD', '') password = os.environ.get('SOLR_ADMIN_PASSWORD', '')
search_url = '{url}/schema/name?wt=json'.format(url=url) search_url = '{url}/schema/name?wt=json'.format(url=url)
@ -74,10 +75,13 @@ def check_solr_connection(retry=None):
try: try:
request = urllib.request.Request(search_url) if not username:
base64string = base64.b64encode(bytes('%s:%s' % (username, password),'ascii')) connection = urllib.request.urlopen(search_url)
request.add_header("Authorization", "Basic %s" % base64string.decode('utf-8')) else:
connection = urllib.request.urlopen(request) request = urllib.request.Request(search_url)
base64string = base64.b64encode(bytes('%s:%s' % (username, password),'ascii'))
request.add_header("Authorization", "Basic %s" % base64string.decode('utf-8'))
connection = urllib.request.urlopen(request)
except urllib.error.URLError as e: except urllib.error.URLError as e:
print('[prerun] Unable to connect to solr...try again in a while.') print('[prerun] Unable to connect to solr...try again in a while.')
import time import time