Create OL_SOLR_BASE_URL env param for solr-updater

Replace the old --solr-url CLI argument, which does not affect
other spots where solr is initialized, like get_solr()

Author: cdrini

compose.production.yaml

@@ -256,8 +256,8 @@ services:
     environment:
       - OL_CONFIG=/olsystem/etc/openlibrary.yml
       - OL_URL=https://openlibrary.org/
-      - EXTRA_OPTS=--solr-url http://ol-solr0:8984/solr/openlibrary
-        --no-solr-next
+      - OL_SOLR_BASE_URL=http://ol-solr0:8984/solr/openlibrary
+      - EXTRA_OPTS=--no-solr-next
     volumes:
       - ../olsystem:/olsystem
     logging:
@@ -276,9 +276,9 @@ services:
     environment:
       - OL_CONFIG=/olsystem/etc/openlibrary.yml
       - OL_URL=https://openlibrary.org/
+      - OL_SOLR_BASE_URL=http://ol-solr1:8984/solr/openlibrary
       - STATE_FILE=solr-next-update.offset
-      - EXTRA_OPTS=--solr-url http://ol-solr1:8984/solr/openlibrary
-        --solr-next
+      - EXTRA_OPTS=--solr-next
     volumes:
       - solr-updater-data:/solr-updater-data
       - ../olsystem:/olsystem

openlibrary/plugins/worksearch/search.py

@@ -1,5 +1,7 @@
 """Search utilities."""
 
+import os
+
 from infogami import config
 from openlibrary.utils.solr import Solr
 
@@ -9,6 +11,10 @@
 def get_solr():
     global _ACTIVE_SOLR
     if not _ACTIVE_SOLR:
-        base_url = config.plugin_worksearch.get('solr_base_url')
+        if os.environ.get('OL_SOLR_BASE_URL'):
+            base_url = os.environ['OL_SOLR_BASE_URL']
+        else:
+            base_url = config.plugin_worksearch.get('solr_base_url')
+
         _ACTIVE_SOLR = Solr(base_url)
     return _ACTIVE_SOLR

openlibrary/solr/utils.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 from dataclasses import dataclass, field
 
 import httpx
@@ -30,9 +31,13 @@ def get_solr_base_url():
     """
     global solr_base_url
 
-    load_config()
+    if solr_base_url is not None:
+        return solr_base_url
 
-    if not solr_base_url:
+    if os.environ.get('OL_SOLR_BASE_URL'):
+        solr_base_url = os.environ['OL_SOLR_BASE_URL']
+    else:
+        load_config()
         solr_base_url = config.runtime_config['plugin_worksearch']['solr_base_url']
 
     return solr_base_url

scripts/solr_updater/solr_updater.py

@@ -277,13 +277,15 @@ async def main(
     state_file: str = 'solr-update.state',
     exclude_edits_containing: str | None = None,
     ol_url='http://openlibrary.org/',
-    solr_url: str | None = None,
     solr_next: bool = False,
     socket_timeout: int = 10,
     load_ia_scans: bool = False,
     initial_state: str | None = None,
 ):
     """
+    Useful environment variables:
+    - OL_SOLR_BASE_URL: Override the Solr base URL
+
     :param debugger: Wait for a debugger to attach before beginning
     :param exclude_edits_containing: Don't index matching edits
     :param solr_url: If wanting to override what's in the config file
@@ -312,9 +314,6 @@ async def main(
         host = web.lstrips(ol_url, "http://").strip("/")
         update.set_query_host(host)
 
-    if solr_url:
-        update.set_solr_base_url(solr_url)
-
     update.set_solr_next(solr_next)
     set_osp_dump_location(osp_dump)