Skip to content

Commit a806242

Browse files
authored
SNO-191-pyramid-env-vars (#318)
1 parent 4422f56 commit a806242

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@
3636

3737
.python-version
3838
.vscode
39+
venv

src/snovault/app.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import base64
22
import codecs
3+
import copy
34
import json
45
import os
56

@@ -52,7 +53,9 @@ def changelogs(config):
5253

5354

5455
def configure_engine(settings):
55-
engine_url = settings['sqlalchemy.url']
56+
settings = copy.deepcopy(settings)
57+
engine_url = os.environ.get("SQLALCHEMY_URL") or settings['sqlalchemy.url']
58+
settings["sqlalchemy.url"] = engine_url
5659
engine_opts = {}
5760
if engine_url.startswith('postgresql'):
5861
if settings.get('indexer_worker'):

src/snovault/elasticsearch/__init__.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import logging
2+
import os
23

34
from snovault.json_renderer import json_renderer
45
from snovault.util import get_root_request
@@ -28,7 +29,9 @@ def includeme(config):
2829

2930
config.add_request_method(datastore, 'datastore', reify=True)
3031

31-
addresses = aslist(settings['elasticsearch.server'])
32+
addresses = aslist(
33+
os.environ.get("ELASTICSEARCH_URL") or settings['elasticsearch.server']
34+
)
3235
config.registry[ELASTIC_SEARCH] = Elasticsearch(
3336
addresses,
3437
serializer=PyramidJSONSerializer(json_renderer),

src/snovault/elasticsearch/indexer.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,10 @@ def get_related_uuids(request, es, updated, renamed):
160160

161161

162162
def _determine_indexing_protocol(request, uuid_count):
163-
remote_indexing = asbool(request.registry.settings.get('remote_indexing', False))
163+
remote_indexing = asbool(
164+
os.environ.get("REMOTE_INDEXING")
165+
or request.registry.settings.get('remote_indexing', False)
166+
)
164167
if not remote_indexing:
165168
return False
166169
try:
@@ -351,7 +354,10 @@ def index(request):
351354
# Check remote indexing and set head/indexing nodes
352355
this_node = indexer_state.get_obj(INDEXING_NODE_INDEX)
353356
other_node = indexer_state.get_obj(HEAD_NODE_INDEX)
354-
remote_indexing = asbool(request.registry.settings.get('remote_indexing', False))
357+
remote_indexing = asbool(
358+
os.environ.get("REMOTE_INDEXING")
359+
or request.registry.settings.get('remote_indexing', False)
360+
)
355361
did_timeout = False
356362
if remote_indexing:
357363
this_node, other_node, continue_on, did_timeout = _get_nodes(request, indexer_state)

0 commit comments

Comments
 (0)