-
Notifications
You must be signed in to change notification settings - Fork 9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
🌌 Clusterize #2749
base: master
Are you sure you want to change the base?
🌌 Clusterize #2749
Conversation
@@ -419,7 +419,7 @@ def playlist_order | |||
end | |||
def playlist_map | |||
@playlist_map ||= begin | |||
response = RSolr.connect(url: 'http://localhost:8983/solr/').get('select', params: | |||
response = RSolr.connect(url: config.solr_url).get('select', params: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrharpo where does the config
method come from here?
# TODO: Get separate dev and test cores, and change this back to 8888. bug #1 | ||
production: | ||
url: http://127.0.0.1:8983/solr/blacklight-core | ||
url: <%= ENV['SOLR_URL'] || 'http://127.0.0.1:8983/solr/' %> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Blacklight
might be expecting the core name (blacklight-core
) as part of the URL, isn't it?
@@ -10,7 +10,8 @@ class Solr | |||
def initialize | |||
environment = ENV['RAILS_ENV'] || DEFAULT | |||
conf = YAML.load_file(Rails.root + 'config/blacklight.yml') | |||
@connect = RSolr.connect(url: conf[environment]['url']) | |||
solr_url = ENV['SOLR_URL'] || conf[environment]['url'] | |||
@connect = RSolr.connect(url: solr_url + 'blacklight-core') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(see also above comment)
Blacklight gem may be expecting the core name to be a part of the configured URL, so we may run into issues by removing it from blacklight.yml
and adding it back here.
@@ -112,7 +112,7 @@ def process_query(query) | |||
q = QueryMaker.translate(query) | |||
$LOG.info("Query solr for #{query}") | |||
|
|||
@options[:ids] = RSolr.connect(url: 'http://localhost:8983/solr/') | |||
@options[:ids] = RSolr.connect(url: config.solr_url) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(see other related comments)
we're leaving the core name off here, but adding it when connecting to Solr in lib/solr.rb
.
* master: (46 commits) 🏛 Move National Archives (#2814) Wlrh special collection (#2744) Fixes invalid title and summary. (#2817) Create batchconcat.sh (#2805) Felicia lowe orgpage (#2791) Nick civil rights edits 2 (#2815) Iiif endpoint (#2781) Stories of the land (#2774) 🌎 Fixes map asset location (#2809) Witnessing nm update (#2807) Nick civil rights edits 2 (#2804) 🗺 Station Map (#2746) Update this-way-out.md (#2803) Nick dead link fix (#2802) Adds script to parse apache logs looking for bad bots (#2762) Update people.md Update organizations.md Update places 2.md Update people.md Update organizations.md ...
Clusterize
Updates for Kubernetes deployment