Merge c5ba2bb into c561411

Author: rubickcz

security/backends/elasticsearch/connection.py

@@ -15,7 +15,8 @@ def connect(self, init_documents):
                 raise ImproperlyConfigured('You must set "SECURITY_ELASTICSEARCH_DATABASE" setting')
 
             connection.connection = connections.create_connection(
-                **settings.ELASTICSEARCH_DATABASE
+                **settings.ELASTICSEARCH_DATABASE,
+                timeout=settings.ELASTICSEARCH_TIMEOUT,
             )
             if init_documents:
                 self.init_documents()

security/config.py

@@ -59,6 +59,7 @@
     'ELASTICSEARCH_CLEAN_LOGS_DELETE_ATTEMPTS': 10,
     'ELASTICSEARCH_CLEAN_LOGS_DELETE_ATTEMPT_SLEEP': 5,
     'ELASTICSEARCH_MAX_NUMBER_OF_TERMS': 65536,
+    'ELASTICSEARCH_TIMEOUT': 10,
     'SQL_CLEAN_LOGS_DELETE_BATCH_SIZE': 1000,
     'BACKEND_WRITERS': None,
     'BACKEND_READER': None,