Connection related fixes.

Author: jaddison

CHANGELOG.md

@@ -1,3 +1,8 @@
+#### 2018-10-02 version 0.3
+
+* Fixing connection reset issue when using multi-processing and a remote Elasticsearch server
+* Backward in compatible: changed the way Django configures Elasticsearch connection settings
+
 #### 2018-09-26 version 0.2
 
 * Adding in post index create/rebuilt `Controller` hooks and associated Django signals

esdocs/__init__.py

@@ -26,7 +26,7 @@
 import logging
 
 __appname__ = __package__
-__version__ = "0.2"
+__version__ = "0.3"
 
 app_version = "{}/{}".format(__appname__, __version__)
 

esdocs/contrib/esdjango/apps.py

@@ -10,13 +10,16 @@ def ready(self):
         from ...utils import register_serializers
         from .settings import (
             ESDOCS_SERIALIZER_MODULES,
-            ESDOCS_SERIALIZER_COMPATIBILITY_HOOKS
+            ESDOCS_SERIALIZER_COMPATIBILITY_HOOKS,
+            ESDOCS_USING,
+            ESDOCS_CONNECTIONS
         )
 
         from elasticsearch_dsl import connections
         # TODO: perhaps have some more elaborate multi-client creation steps here, based on settings?
         # then, we can pass in the 'default' client into `register_serializers`
-        client = connections.create_connection(hosts=settings.ELASTICSEARCH_SERVER, timeout=20)
+        connections.configure(**ESDOCS_CONNECTIONS)
+        client = connections.get_connection(ESDOCS_USING)
 
         # this loads the serializers and initializes compatibility hooks
         register_serializers(ESDOCS_SERIALIZER_MODULES, client=client)

esdocs/contrib/esdjango/settings.py

@@ -1,5 +1,10 @@
 from django.conf import settings
 
+ESDOCS_USING = getattr(settings, 'ESDOCS_USING', None) or 'default'
+ESDOCS_CONNECTIONS = getattr(settings, 'ESDOCS_CONNECTIONS', {}) or {
+    'default': 'localhost:9200'
+}
+
 ESDOCS_SERIALIZER_MODULES = getattr(settings, 'ESDOCS_SERIALIZER_MODULES', [])
 ESDOCS_SERIALIZER_COMPATIBILITY_HOOKS = getattr(settings, 'ESDOCS_SERIALIZER_COMPATIBILITY_HOOKS', []) or [
     'esdocs.contrib.esdjango.compatibility.manager',

esdocs/controller.py

@@ -34,7 +34,7 @@ def parallel_prep(self):
             # remove the existing connection (but keeps the _kwargs settings for it
             connections.connections._conns.pop(label, None)
             # recreate the connection using the retained _kwargs (view the source)
-            connections.create_connection(label)
+            connections.get_connection(label)
 
     @property
     def indexes(self):