Merge tag '2024-04-26_3868_extend_timeout_article_sync' into develop

Increase ES req timeout

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
 

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)