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

Roll back part of the change that attempted to correct some of the

Browse Source 
memory usage
This commit is contained in:
Matthew Jones
2014-09-03 14:43:19 -04:00
parent 95c73ae348
commit 5aebf5508e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/management/commands/run_callback_receiver.py
View File

@@ -102,7 +102,7 @@ class CallbackReceiver(object):
else: else:
parent = None parent = None
if parent is not None: if parent is not None:
message['parent'] = parent message['parent'] = parent.id
if 'created' in message: if 'created' in message:
del(message['created']) del(message['created'])
if message['event'] in ('playbook_on_start', 'playbook_on_play_start', if message['event'] in ('playbook_on_start', 'playbook_on_play_start',
@@ -158,9 +158,9 @@ class CallbackReceiver(object):
data['event_data']['res']['invocation']['module_args'] = "" data['event_data']['res']['invocation']['module_args'] = ""
job_event = JobEvent(**data) job_event = JobEvent(**data)
if parent_id is not None: if parent_id is not None:
job_event.parent_id = parent_id job_event.parent = JobEvent.objects.get(id=parent_id)
job_event.save(post_process=True) job_event.save(post_process=True)
return job_event.id return job_event
except DatabaseError as e: except DatabaseError as e:
transaction.rollback() transaction.rollback()
print('Database error saving job event, retrying in ' print('Database error saving job event, retrying in '