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

Move skip flag up from event_data and pop it off

Browse Source
This commit is contained in:
Alan Rominger
2021-05-13 10:54:33 -04:00
parent 53e8a9e709
commit 210d5084f0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/dispatch/worker/callback.py
View File

@@ -142,7 +142,7 @@ class CallbackBrokerWorker(BaseWorker):
logger.exception('Database Error Saving Job Event') logger.exception('Database Error Saving Job Event')
duration_to_save = time.perf_counter() - duration_to_save duration_to_save = time.perf_counter() - duration_to_save
for e in events: for e in events:
if not e.event_data.get('skip_websocket_message', False): if not getattr(e, '_skip_websocket_message', False):
emit_event_detail(e) emit_event_detail(e)
self.buff = {} self.buff = {}
self.last_flush = time.time() self.last_flush = time.time()
@@ -208,7 +208,13 @@ class CallbackBrokerWorker(BaseWorker):
GuidMiddleware.set_guid('') GuidMiddleware.set_guid('')
return return
skip_websocket_message = body.pop('skip_websocket_message', False)
event = cls.create_from_data(**body) event = cls.create_from_data(**body)
if skip_websocket_message:
event._skip_websocket_message = True
self.buff.setdefault(cls, []).append(event) self.buff.setdefault(cls, []).append(event)
retries = 0 retries = 0

2
awx/main/tasks.py
View File

@@ -1189,7 +1189,7 @@ class BaseTask(object):
self.recent_event_timings.append(cpu_time) self.recent_event_timings.append(cpu_time)
else: else:
event_data.setdefault('event_data', {}) event_data.setdefault('event_data', {})
event_data['event_data']['skip_websocket_message'] = True event_data['skip_websocket_message'] = True
elif self.recent_event_timings.maxlen: elif self.recent_event_timings.maxlen:
self.recent_event_timings.append(time.time()) self.recent_event_timings.append(time.time())