valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle exception when no Slack API key was provided

Browse Source
This commit is contained in:
Elias Probst 2016-07-25 11:39:29 +02:00
parent c663c8bb5b
commit 69afcc4060
No known key found for this signature in database
GPG Key ID: 82C512826511BADB
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/states/slack.py
View File

@ -24,6 +24,7 @@ The api key can be specified in the master or minion configuration like below:
api_key: peWcBiMOS9HrZG15peWcBiMOS9HrZG15
'''
from salt.exceptions import SaltInvocationError
def __virtual__():
@ -96,18 +97,18 @@ def post_message(name,
ret['comment'] = 'Slack message is missing: {0}'.format(message)
return ret
result = __salt__['slack.post_message'](
channel=channel,
message=message,
from_name=from_name,
api_key=api_key,
icon=icon,
)
if result:
try:
result = __salt__['slack.post_message'](
channel=channel,
message=message,
from_name=from_name,
api_key=api_key,
icon=icon,
)
except SaltInvocationError as sie:
ret['comment'] = 'Failed to send message: {0} ({1})'.format(name, sie)
else:
ret['result'] = True
ret['comment'] = 'Sent message: {0}'.format(name)
else:
ret['comment'] = 'Failed to send message: {0}'.format(name)
return ret