adds some env vars to services

mlibrary · Oct 4, 2024 · c359a9b · c359a9b
1 parent 9e5896d
commit c359a9b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/umich_catalog_indexing/env.development b/umich_catalog_indexing/env.development
@@ -4,7 +4,6 @@ MACC_PRODUCTION_SOLR_URL=http://solr:8983/solr/biblio
 HATCHER_PRODUCTION_SOLR_URL=http://solr:8983/solr/biblio
 LIVE_SOLR_URL=http://solr:8983/solr/biblio
 REINDEX_SOLR_URL=http://solr:8983/solr/biblio
-SIDEKIQ_SUPERVISOR_HOST=http://supervisor:3000
 SOLRCLOUD_ON=true
 PROMETHEUS_PUSH_GATEWAY=http://pushgateway:9091
 HLB_XML_ENDPOINT=https://apps.lib.umich.edu/browse/categories/xml.php 

diff --git a/umich_catalog_indexing/lib/services/solr.rb b/umich_catalog_indexing/lib/services/solr.rb
@@ -1,7 +1,7 @@
-S.register(:solrcloud_on?) do
-  (ENV["SOLRCLOUD_ON"] == "true") ? true : false
-end
+S.register(:solrcloud_on?) { ENV["SOLRCLOUD_ON"] == "true" }
 S.register(:solr_threads) { ENV.fetch("SOLR_THREADS", 1).to_i }
 S.register(:solr_user) { ENV.fetch("SOLR_USER", "solr") }
 S.register(:solr_password) { ENV.fetch("SOLR_PASSWORD", "SolrRocks") }
 S.register(:processing_threads) { ENV.fetch("PROCESSING_THREADS", 1) }
+S.register(:supervisor_on?) { ENV["SUPERVISOR_ON"] == "true" }
+S.register(:sidekiq_supervisor_host) { ENV.fetch("SIDEKIQ_SUPERVISOR_HOST", "http://supervisor:3000") }
diff --git a/umich_catalog_indexing/lib/sidekiq_jobs.rb b/umich_catalog_indexing/lib/sidekiq_jobs.rb
@@ -5,7 +5,7 @@
 
 class JobQueued
   def call(worker, job, queue, redis_pool)
-    Faraday.post("#{ENV.fetch("SIDEKIQ_SUPERVISOR_HOST")}/api/v1/jobs", {
+    Faraday.post("#{S.sidekiq_supervisor_host}/api/v1/jobs", {
       job_id: job["jid"],
       arguments: job["args"].to_json,
       job_class: job["class"],
@@ -17,19 +17,19 @@ def call(worker, job, queue, redis_pool)
 
 Sidekiq.configure_client do |config|
   config.client_middleware do |chain|
-    chain.add JobQueued if ENV.fetch("SUPERVISOR_ON") == "true"
+    chain.add JobQueued if S.supervisor_on?
   end
 end
 
 class CheckInCheckOut
   def call(worker, job, queue)
-    Faraday.post("#{ENV.fetch("SIDEKIQ_SUPERVISOR_HOST")}/api/v1/jobs/#{job["jid"]}/started", {
+    Faraday.post("#{S.sidekiq_supervisor_host}/api/v1/jobs/#{job["jid"]}/started", {
       arguments: job["args"].to_json,
       job_class: job["class"],
       queue: queue
     })
     yield
-    Faraday.post("#{ENV.fetch("SIDEKIQ_SUPERVISOR_HOST")}/api/v1/jobs/#{job["jid"]}/complete", {
+    Faraday.post("#{S.sidekiq_supervisor_host}/api/v1/jobs/#{job["jid"]}/complete", {
       arguments: job["args"].to_json,
       job_class: job["class"],
       queue: queue
@@ -39,7 +39,7 @@ def call(worker, job, queue)
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.add CheckInCheckOut if ENV.fetch("SUPERVISOR_ON") == "true"
+    chain.add CheckInCheckOut if S.supervisor_on?
   end
 end