From 5aebf5508ea1d2e23b229db444a63da1d922353e Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 3 Sep 2014 14:43:19 -0400 Subject: [PATCH] Roll back part of the change that attempted to correct some of the memory usage --- awx/main/management/commands/run_callback_receiver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/management/commands/run_callback_receiver.py b/awx/main/management/commands/run_callback_receiver.py index 2e5e93766b..b2ee842749 100644 --- a/awx/main/management/commands/run_callback_receiver.py +++ b/awx/main/management/commands/run_callback_receiver.py @@ -102,7 +102,7 @@ class CallbackReceiver(object): else: parent = None if parent is not None: - message['parent'] = parent + message['parent'] = parent.id if 'created' in message: del(message['created']) 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'] = "" job_event = JobEvent(**data) 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) - return job_event.id + return job_event except DatabaseError as e: transaction.rollback() print('Database error saving job event, retrying in '