Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix on older python versions, plus various improvements #1062

Merged
merged 1 commit into from
Sep 19, 2012
Merged

Fix on older python versions, plus various improvements #1062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions library/wait_for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']),
Expand All @@ -39,45 +40,55 @@ 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']

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>>
Expand Down