From 740cccd82ea6649af107d9081b814b38397d9575 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 29 Mar 2017 14:33:30 -0400 Subject: [PATCH] Tolerate a target that won't TCP SLP --- confluent_server/confluent/discovery/handlers/generic.py | 1 + confluent_server/confluent/discovery/protocols/slp.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/discovery/handlers/generic.py b/confluent_server/confluent/discovery/handlers/generic.py index 743dece2..2e6c68e4 100644 --- a/confluent_server/confluent/discovery/handlers/generic.py +++ b/confluent_server/confluent/discovery/handlers/generic.py @@ -64,4 +64,5 @@ class NodeHandler(object): except IOError as ie: if ie.errno == errno.ECONNREFUSED: return None + raise return self._fp \ No newline at end of file diff --git a/confluent_server/confluent/discovery/protocols/slp.py b/confluent_server/confluent/discovery/protocols/slp.py index 747f19c9..44cb4e17 100644 --- a/confluent_server/confluent/discovery/protocols/slp.py +++ b/confluent_server/confluent/discovery/protocols/slp.py @@ -307,7 +307,10 @@ def _add_attributes(parsed): net = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) else: net = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - net.connect(target) + try: + net.connect(target) + except socket.error: + return net.sendall(attrq) rsp = net.recv(8192) net.close()