From 210d5084f0e22388cae98e2335c45925984ce35b Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Thu, 13 May 2021 10:54:33 -0400 Subject: [PATCH] Move skip flag up from event_data and pop it off --- awx/main/dispatch/worker/callback.py | 8 +++++++- awx/main/tasks.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/awx/main/dispatch/worker/callback.py b/awx/main/dispatch/worker/callback.py index 65d5f16844..279db49bfb 100644 --- a/awx/main/dispatch/worker/callback.py +++ b/awx/main/dispatch/worker/callback.py @@ -142,7 +142,7 @@ class CallbackBrokerWorker(BaseWorker): logger.exception('Database Error Saving Job Event') duration_to_save = time.perf_counter() - duration_to_save 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) self.buff = {} self.last_flush = time.time() @@ -208,7 +208,13 @@ class CallbackBrokerWorker(BaseWorker): GuidMiddleware.set_guid('') return + skip_websocket_message = body.pop('skip_websocket_message', False) + event = cls.create_from_data(**body) + + if skip_websocket_message: + event._skip_websocket_message = True + self.buff.setdefault(cls, []).append(event) retries = 0 diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 20559f7982..1fd7fe19f1 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1189,7 +1189,7 @@ class BaseTask(object): self.recent_event_timings.append(cpu_time) else: 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: self.recent_event_timings.append(time.time())