External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 17:28:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7280 from apollo13/patch-1

Browse Source 
Send content-type with mattermost notifications, fixes #7264

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-06-08 17:27:05 +00:00
committed by GitHub
parent feb9c5700c cf6235f6ea
commit 28baa8b24b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/notifications/mattermost_backend.py
View File

@@ -3,7 +3,6 @@
import logging import logging
import requests import requests
import json
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -45,7 +44,7 @@ class MattermostBackend(AWXBaseEmailBackend, CustomNotificationBase):
payload['text'] = m.subject payload['text'] = m.subject
r = requests.post("{}".format(m.recipients()[0]), r = requests.post("{}".format(m.recipients()[0]),
data=json.dumps(payload), verify=(not self.mattermost_no_verify_ssl)) json=payload, verify=(not self.mattermost_no_verify_ssl))
if r.status_code >= 400: if r.status_code >= 400:
logger.error(smart_text(_("Error sending notification mattermost: {}").format(r.text))) logger.error(smart_text(_("Error sending notification mattermost: {}").format(r.text)))
if not self.fail_silently: if not self.fail_silently: