summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-10-17 11:17:07 (GMT)
committerMartin Kosek <mkosek@redhat.com>2011-10-24 13:08:50 (GMT)
commit5451328bc55fe964c61e7b87959310f9c6748cf8 (patch)
tree19521449f16ecdbe4863694713f138fa9c87d73d
parent95d6a2256c6039c704fafe8fc5c8c85fb939c972 (diff)
downloadfreeipa-5451328bc55fe964c61e7b87959310f9c6748cf8.zip
freeipa-5451328bc55fe964c61e7b87959310f9c6748cf8.tar.gz
freeipa-5451328bc55fe964c61e7b87959310f9c6748cf8.tar.xz
Spin for connection success also when socket is not (yet) available
We were spinning for socket connection if attempt to connect returned errno 111 (connection refused). However, it is not enough for local AF_UNIX sockets as heavy applications might not be able to start yet and therefore the whole path might be missing. So spin for errno 2 (no such file or directory) as well. Partial fix for https://fedorahosted.org/freeipa/ticket/1990
-rw-r--r--ipaserver/install/installutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 5cfc8f0..0a36c35 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -507,7 +507,7 @@ def wait_for_open_socket(socket_name, timeout=0):
s.close()
break;
except socket.error, e:
- if e.errno == 111: # 111: Connection refused
+ if e.errno in (2,111): # 111: Connection refused, 2: File not found
if timeout and time.time() > op_timeout: # timeout exceeded
raise e
time.sleep(1)