shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Merge pull request #1903 from AlanCoding/jake

Browse Source 
Add final_line_count to EOF websocket
This commit is contained in:
Alan Rominger 2018-05-22 11:47:51 -04:00 committed by GitHub
commit e2cd05e8e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,7 @@ class CallbackBrokerWorker(ConsumerMixin):
if body.get('event') == 'EOF':
try:
final_line_count = body.get('final_line_count', 0)
logger.info('Event processing is finished for Job {}, sending notifications'.format(job_identifier))
# EOF events are sent when stdout for the running task is
# closed. don't actually persist them to the database; we
@ -169,7 +170,7 @@ class CallbackBrokerWorker(ConsumerMixin):
# approximation for when a job is "done"
emit_channel_notification(
'jobs-summary',
dict(group_name='jobs', unified_job_id=job_identifier)
dict(group_name='jobs', unified_job_id=job_identifier, final_line_count=final_line_count)
)
# Additionally, when we've processed all events, we should
# have all the data we need to send out success/failure

2
awx/main/utils/common.py
View File

@ -989,7 +989,7 @@ class OutputEventFilter(object):
if value:
self._emit_event(value)
self._buffer = StringIO()
self._event_callback(dict(event='EOF'))
self._event_callback(dict(event='EOF', final_line_count=self._start_line))
def _emit_event(self, buffered_stdout, next_event_data=None):
next_event_data = next_event_data or {}