cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow wait_for to wait on non-traditional files

Browse source 
Use os.path.exists to check for file existence, instead of "can we open
this file for reading".

Fixes #6710
This commit is contained in:
Henry Finucane 2014-05-12 23:21:55 -07:00
parent dc3d22cf0d
commit 34bf59ac4c
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utilities/wait_for
View file

@ -176,21 +176,24 @@ def main():
end = start + datetime.timedelta(seconds=timeout) end = start + datetime.timedelta(seconds=timeout)
while datetime.datetime.now() < end: while datetime.datetime.now() < end:
if path: if path:
if os.path.exists(path):
if search_regex:
try: try:
f = open(path) f = open(path)
try: try:
if search_regex:
if re.search(search_regex, f.read(), re.MULTILINE): if re.search(search_regex, f.read(), re.MULTILINE):
break break
else: else:
time.sleep(1) time.sleep(1)
else:
break
finally: finally:
f.close() f.close()
except IOError: except IOError:
time.sleep(1) time.sleep(1)
pass pass
else:
break
else:
time.sleep(1)
elif port: elif port:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(connect_timeout) s.settimeout(connect_timeout)