fix connection failure when consul's leader running locally

amenezes · Jun 29, 2019 · b8dead5 · b8dead5
1 parent 3a4b741
commit b8dead5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/discovery/aioclient.py b/discovery/aioclient.py
@@ -27,12 +27,14 @@ def __init__(self, host, port, app):
         """Create a instance for async consul client."""
         super().__init__()
         self.__discovery = consul.Consul(host, port)
-        self.__ensure_leader_connection(port, app)
+        self.__ensure_leader_connection(host, port, app)
 
-    def __ensure_leader_connection(self, port, loop):
+    def __ensure_leader_connection(self, host, port, loop):
         leader = self.__discovery.status.leader()
-        leader = leader.split(':')
-        self.__discovery = consul.aio.Consul(f"{leader[0]}", port, loop)
+        leader = leader.split(':')[0]
+        if leader in ['127.0.0.1', 'localhost', '127.0.1.1']:
+            leader = host
+        self.__discovery = consul.aio.Consul(f"{leader}", port, loop)
 
     def __create_service(self, service_name, service_port, healthcheck_path):
         """Adjust the data of the service to be managed."""

diff --git a/discovery/client.py b/discovery/client.py
@@ -25,12 +25,14 @@ def __init__(self, host, port):
         """Create a instance for standard consul client."""
         super().__init__()
         self.__discovery = consul.Consul(host, port)
-        self.__ensure_leader_connection(port)
+        self.__ensure_leader_connection(host, port)
 
-    def __ensure_leader_connection(self, port):
+    def __ensure_leader_connection(self, host, port):
         leader = self.__discovery.status.leader()
-        leader = leader.split(':')
-        self.__discovery = consul.Consul(f"{leader[0]}", port)
+        leader = leader.split(':')[0]
+        if leader in ['127.0.0.1', 'localhost', '127.0.1.1']:
+            leader = host
+        self.__discovery = consul.Consul(f"{leader}", port)
 
     def __create_service(self, service_name, service_port, healthcheck_path):
         """Adjust the data of the service to be managed."""

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="discovery-client",
-    version="0.2.4",
+    version="0.2.5",
     author="alexandre menezes",
     author_email="alexandre.fmenezes@gmail.com",
     description="discovery service client",