wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix on older python versions, plus various improvements

Browse source 
This change includes:

 - (on possibly older python versions ?) a string variable test using the 'is' operator fails (so it always return ok immediately after initial delay)
 - add a missing socket.settimeout() for the state=started case (if the machine does not exist, timeout defaults to 60 seconds)
 - add a connect_timeout option to customize the default connection timeout
 - use socket.shutdown(2) to close immediately
 - return the elapsed time
This commit is contained in:
Dag Wieers 2012-09-19 12:29:47 +02:00
parent b2af95e4a6
commit 8912258016
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
library/wait_for
View file

@ -29,6 +29,7 @@ def main():
argument_spec = dict(
host=dict(default='127.0.0.1'),
timeout=dict(default=300),
connect_timeout=dict(default=5),
delay=dict(default=0),
port=dict(required=True),
state=dict(default='started', choices=['started', 'stopped']),
@ -39,6 +40,7 @@ def main():
host = params['host']
timeout = int(params['timeout'])
connect_timeout = int(params['connect_timeout'])
delay = int(params['delay'])
port = int(params['port'])
state = params['state']
@ -46,38 +48,47 @@ def main():
if delay:
time.sleep(delay)
if state is 'stopped':
start = datetime.datetime.now()
if state == 'stopped':
### first wait for the host to go down
end = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
end = start + datetime.timedelta(seconds=timeout)
while datetime.datetime.now() < end:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(5)
s.settimeout(connect_timeout)
try:
s.connect( (host, port) )
s.shutdown(socket.SHUT_RDWR)
s.close()
time.sleep(1)
except:
break
else:
module.fail_json(msg="Timeout when waiting for %s to stop."%(host))
elapsed = datetime.datetime.now() - start
module.fail_json(msg="Timeout when waiting for %s:%s to stop." % (host, port), elapsed=elapsed.seconds)
if state is 'started':
elif state == 'started':
### wait for the host to come up
end = datetime.datetime.now() + datetime.timedelta(seconds=timeout)
end = start + datetime.timedelta(seconds=timeout)
while datetime.datetime.now() < end:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(connect_timeout)
try:
s.connect( (host, port) )
s.shutdown(socket.SHUT_RDWR)
s.close()
break
except:
time.sleep(1)
pass
else:
module.fail_json(msg="Timeout when waiting for %s"%(host))
elapsed = datetime.datetime.now() - start
module.fail_json(msg="Timeout when waiting for %s:%s" % (host, port), elapsed=elapsed.seconds)
module.exit_json(state=state, port=port)
elapsed = datetime.datetime.now() - start
module.exit_json(state=state, port=port, elapsed=elapsed.seconds)
# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>