From 3a094a506227c67207d424fb20c78617bfca0cbd Mon Sep 17 00:00:00 2001 From: Steve Eardley Date: Fri, 26 Apr 2024 17:46:15 +0100 Subject: [PATCH] Double ES request timeout from 10 (default) to 20 via new app config key --- portality/core.py | 16 ++++------------ portality/settings.py | 4 ++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/portality/core.py b/portality/core.py index 2eb486ea8e..8280edc620 100644 --- a/portality/core.py +++ b/portality/core.py @@ -166,18 +166,10 @@ def load_crossref_schema(app): def create_es_connection(app): # ~~ElasticConnection:Framework->Elasticsearch:Technology~~ - # temporary logging config for debugging index-per-type - #import logging - #esprit.raw.configure_logging(logging.DEBUG) - - # FIXME: we are removing esprit conn in favour of elasticsearch lib - # make a connection to the index - # if app.config['ELASTIC_SEARCH_INDEX_PER_TYPE']: - # conn = esprit.raw.Connection(host=app.config['ELASTIC_SEARCH_HOST'], index='') - # else: - # conn = esprit.raw.Connection(app.config['ELASTIC_SEARCH_HOST'], app.config['ELASTIC_SEARCH_DB']) - - conn = elasticsearch.Elasticsearch(app.config['ELASTICSEARCH_HOSTS'], verify_certs=app.config.get("ELASTIC_SEARCH_VERIFY_CERTS", True)) + + conn = elasticsearch.Elasticsearch(app.config['ELASTICSEARCH_HOSTS'], + verify_certs=app.config.get("ELASTIC_SEARCH_VERIFY_CERTS", True), + request_timeout=app.config.get('ELASTICSEARCH_REQ_TIMEOUT', 15)) return conn diff --git a/portality/settings.py b/portality/settings.py index 744e4b1108..7615590eca 100644 --- a/portality/settings.py +++ b/portality/settings.py @@ -72,8 +72,8 @@ ELASTIC_SEARCH_SNAPSHOT_TTL = 366 ES_TERMS_LIMIT = 1024 - -ES_READ_TIMEOUT = '2m' +ELASTICSEARCH_REQ_TIMEOUT = 20 # Seconds - used in core.py for whole ES connection request timeout +ES_READ_TIMEOUT = '2m' # Minutes - used in DAO for searches ##################################################### # Elastic APM config (MUST be configured in env file)