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

Adds channel key parameter

Browse source
This commit is contained in:
Jimena Cabrera-Notari 2014-07-16 11:42:21 +01:00
parent eb61c3737c
commit 59a0d3a77b
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
notification/irc
View file

@ -57,6 +57,11 @@ options:
description: description:
- Channel name - Channel name
required: true required: true
key:
description:
- Channel key
required: false
version_added: 1.7
passwd: passwd:
description: description:
- Server password - Server password
@ -93,7 +98,7 @@ import socket
from time import sleep from time import sleep
def send_msg(channel, msg, server='localhost', port='6667', def send_msg(channel, msg, server='localhost', port='6667', key=None,
nick="ansible", color='none', passwd=False, timeout=30): nick="ansible", color='none', passwd=False, timeout=30):
'''send message to IRC''' '''send message to IRC'''
@ -133,7 +138,11 @@ def send_msg(channel, msg, server='localhost', port='6667',
raise Exception('Timeout waiting for IRC server welcome response') raise Exception('Timeout waiting for IRC server welcome response')
sleep(0.5) sleep(0.5)
irc.send('JOIN %s\r\n' % channel) if key:
irc.send('JOIN %s %s\r\n' % (channel, key))
else:
irc.send('JOIN %s\r\n' % channel)
join = '' join = ''
start = time.time() start = time.time()
while 1: while 1:
@ -166,6 +175,7 @@ def main():
color=dict(default="none", choices=["yellow", "red", "green", color=dict(default="none", choices=["yellow", "red", "green",
"blue", "black", "none"]), "blue", "black", "none"]),
channel=dict(required=True), channel=dict(required=True),
key=dict(),
passwd=dict(), passwd=dict(),
timeout=dict(type='int', default=30) timeout=dict(type='int', default=30)
), ),
@ -178,11 +188,12 @@ def main():
msg = module.params["msg"] msg = module.params["msg"]
color = module.params["color"] color = module.params["color"]
channel = module.params["channel"] channel = module.params["channel"]
key = module.params["key"]
passwd = module.params["passwd"] passwd = module.params["passwd"]
timeout = module.params["timeout"] timeout = module.params["timeout"]
try: try:
send_msg(channel, msg, server, port, nick, color, passwd, timeout) send_msg(channel, msg, server, port, key, 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)