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

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-05-01 13:53:30 -04:00
parent d1671d72dc 9c5f04b1e0
commit 2997911fd4
4 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tasks.py
View File

@@ -1232,10 +1232,12 @@ class BaseTask(object):
# this is a _little_ expensive to filter
# with regex, but project updates don't have many events,
# so it *should* have a negligible performance impact
task = event_data.get('event_data', {}).get('task_action')
try:
event_data_json = json.dumps(event_data)
event_data_json = UriCleaner.remove_sensitive(event_data_json)
event_data = json.loads(event_data_json)
if task in ('git', 'hg', 'svn'):
event_data_json = json.dumps(event_data)
event_data_json = UriCleaner.remove_sensitive(event_data_json)
event_data = json.loads(event_data_json)
except json.JSONDecodeError:
pass