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

Merge pull request #1062 from dagwieers/wait_for-fix

Browse source 
Fix on older python versions, plus various improvements
This commit is contained in:
Michael DeHaan 2012-09-19 06:36:56 -07:00
commit 1bd9ea6440
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( argument_spec = dict(
host=dict(default='127.0.0.1'), host=dict(default='127.0.0.1'),
timeout=dict(default=300), timeout=dict(default=300),
connect_timeout=dict(default=5),
delay=dict(default=0), delay=dict(default=0),
port=dict(required=True), port=dict(required=True),
state=dict(default='started', choices=['started', 'stopped']), state=dict(default='started', choices=['started', 'stopped']),
@ -39,6 +40,7 @@ def main():
host = params['host'] host = params['host']
timeout = int(params['timeout']) timeout = int(params['timeout'])
connect_timeout = int(params['connect_timeout'])
delay = int(params['delay']) delay = int(params['delay'])
port = int(params['port']) port = int(params['port'])
state = params['state'] state = params['state']
@ -46,38 +48,47 @@ def main():
if delay: if delay:
time.sleep(delay) time.sleep(delay)
if state is 'stopped': start = datetime.datetime.now()
if state == 'stopped':
### first wait for the host to go down ### 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: while datetime.datetime.now() < end:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(5) s.settimeout(connect_timeout)
try: try:
s.connect( (host, port) ) s.connect( (host, port) )
s.shutdown(socket.SHUT_RDWR)
s.close() s.close()
time.sleep(1) time.sleep(1)
except: except:
break break
else: 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 ### 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: while datetime.datetime.now() < end:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(connect_timeout)
try: try:
s.connect( (host, port) ) s.connect( (host, port) )
s.shutdown(socket.SHUT_RDWR)
s.close() s.close()
break break
except: except:
time.sleep(1) time.sleep(1)
pass
else: 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 # this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>