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

Merge pull request #2060 from AlanCoding/one_less_counter

Browse Source 
Get rid of duplicate counter variable
This commit is contained in:
Alan Rominger
2018-06-20 09:46:03 -04:00
committed by GitHub
parent bb657de6a7 16696a6fea
commit d1bc9758db
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -1024,7 +1024,7 @@ class BaseTask(Task):
if stdout_handle: if stdout_handle:
stdout_handle.flush() stdout_handle.flush()
stdout_handle.close() stdout_handle.close()
event_ct = getattr(stdout_handle, '_event_ct', 0) event_ct = getattr(stdout_handle, '_counter', 0)
logger.info('%s finished running, producing %s events.', logger.info('%s finished running, producing %s events.',
instance.log_format, event_ct) instance.log_format, event_ct)
except Exception: except Exception:

2
awx/main/tests/unit/test_tasks.py
View File

@@ -448,7 +448,7 @@ class TestGenericRun(TestJobExecution):
def test_event_count(self): def test_event_count(self):
with mock.patch.object(self.task, 'get_stdout_handle') as mock_stdout: with mock.patch.object(self.task, 'get_stdout_handle') as mock_stdout:
handle = OutputEventFilter(lambda event_data: None) handle = OutputEventFilter(lambda event_data: None)
handle._event_ct = 334 handle._counter = 334
mock_stdout.return_value = handle mock_stdout.return_value = handle
self.task.run(self.pk) self.task.run(self.pk)

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

@@ -945,8 +945,7 @@ class OutputEventFilter(object):
def __init__(self, event_callback): def __init__(self, event_callback):
self._event_callback = event_callback self._event_callback = event_callback
self._event_ct = 0 self._counter = 0
self._counter = 1
self._start_line = 0 self._start_line = 0
self._buffer = StringIO() self._buffer = StringIO()
self._last_chunk = '' self._last_chunk = ''
@@ -1005,8 +1004,8 @@ class OutputEventFilter(object):
stdout_chunks = [] stdout_chunks = []
for stdout_chunk in stdout_chunks: for stdout_chunk in stdout_chunks:
event_data['counter'] = self._counter
self._counter += 1 self._counter += 1
event_data['counter'] = self._counter
event_data['stdout'] = stdout_chunk[:-2] if len(stdout_chunk) > 2 else "" event_data['stdout'] = stdout_chunk[:-2] if len(stdout_chunk) > 2 else ""
n_lines = stdout_chunk.count('\n') n_lines = stdout_chunk.count('\n')
event_data['start_line'] = self._start_line event_data['start_line'] = self._start_line
@@ -1014,7 +1013,6 @@ class OutputEventFilter(object):
self._start_line += n_lines self._start_line += n_lines
if self._event_callback: if self._event_callback:
self._event_callback(event_data) self._event_callback(event_data)
self._event_ct += 1
if next_event_data.get('uuid', None): if next_event_data.get('uuid', None):
self._current_event_data = next_event_data self._current_event_data = next_event_data