Try to follow RFC2812 for waiting on serverl welcome and join messages before performing more tasks

reviewable/pr18780/r1
Matt Martz 11 years ago
parent 5413ee9431
commit 99bacf7fff

@ -61,10 +61,16 @@ options:
description: description:
- Server password - Server password
required: false required: false
timeout:
description:
- Timeout to use while waiting for successful registration and join
messages, this is to prevent an endless loop
default: 30
version_added: 1.5
# informational: requirements for nodes # informational: requirements for nodes
requirements: [ socket ] requirements: [ socket ]
author: Jan-Piet Mens author: Jan-Piet Mens, Matt Martz
''' '''
EXAMPLES = ''' EXAMPLES = '''
@ -81,11 +87,14 @@ EXAMPLES = '''
# IRC module support methods. # IRC module support methods.
# #
from time import sleep import re
import socket import socket
from time import sleep
def send_msg(channel, msg, server='localhost', port='6667', def send_msg(channel, msg, server='localhost', port='6667',
nick="ansible", color='black', passwd=False): nick="ansible", color='black', passwd=False, timeout=30):
'''send message to IRC''' '''send message to IRC'''
colornumbers = { colornumbers = {
@ -109,8 +118,28 @@ def send_msg(channel, msg, server='localhost', port='6667',
irc.send('PASS %s\r\n' % passwd) irc.send('PASS %s\r\n' % passwd)
irc.send('NICK %s\r\n' % nick) irc.send('NICK %s\r\n' % nick)
irc.send('USER %s %s %s :ansible IRC\r\n' % (nick, nick, nick)) irc.send('USER %s %s %s :ansible IRC\r\n' % (nick, nick, nick))
time.sleep(1) motd = ''
start = time.time()
while 1:
motd += irc.recv(1024)
if re.search('^:\S+ 00[1-4] %s :' % nick, motd, flags=re.M):
break
elif time.time() - start > timeout:
module.fail_json(msg='Timeout waiting for IRC server welcome '
'response')
time.sleep(0.5)
irc.send('JOIN %s\r\n' % channel) irc.send('JOIN %s\r\n' % channel)
join = ''
start = time.time()
while 1:
join += irc.recv(1024)
if re.search('^:\S+ 366 %s %s :' % (nick, channel), join, flags=re.M):
break
elif time.time() - start > timeout:
module.fail_json(msg='Timeout waiting for IRC JOIN response')
time.sleep(0.5)
irc.send('PRIVMSG %s :%s\r\n' % (channel, message)) irc.send('PRIVMSG %s :%s\r\n' % (channel, message))
time.sleep(1) time.sleep(1)
irc.send('PART %s\r\n' % channel) irc.send('PART %s\r\n' % channel)
@ -122,8 +151,8 @@ def send_msg(channel, msg, server='localhost', port='6667',
# Main # Main
# #
def main():
def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
server=dict(default='localhost'), server=dict(default='localhost'),
@ -133,7 +162,8 @@ def main():
color=dict(default="black", choices=["yellow", "red", "green", color=dict(default="black", choices=["yellow", "red", "green",
"blue", "black"]), "blue", "black"]),
channel=dict(required=True), channel=dict(required=True),
passwd = dict() passwd=dict(),
timeout=dict(type='int', default=30)
), ),
supports_check_mode=True supports_check_mode=True
) )
@ -145,9 +175,10 @@ def main():
color = module.params["color"] color = module.params["color"]
channel = module.params["channel"] channel = module.params["channel"]
passwd = module.params["passwd"] passwd = module.params["passwd"]
timeout = module.params["timeout"]
try: try:
send_msg(channel, msg, server, port, nick, color, passwd) send_msg(channel, msg, server, port, nick, color, passwd, timeout)
except Exception, e: except Exception, e:
module.fail_json(msg="unable to send to IRC: %s" % e) module.fail_json(msg="unable to send to IRC: %s" % e)

Loading…
Cancel
Save