Address event correlation issues in the awx_display callback #1345
Conversation
| @@ -311,7 +295,15 @@ def wrapper(*args, **kwargs): | |||
| return wrapper | |||
|
|
|||
|
|
|||
| Display.display = display_with_context(Display.display) | |||
| for _display_attr in ('banner', 'deprecated', 'display', 'error', | |||
| 'system_warning', 'verbose', 'warning'): | |||
There was a problem hiding this comment.
The display events "supported" by awx are only:
(0, 'debug', _('Debug'), False),
(0, 'verbose', _('Verbose'), False),
(0, 'deprecated', _('Deprecated'), False),
(0, 'warning', _('Warning'), False),
(0, 'system_warning', _('System Warning'), False),
(0, 'error', _('Error'), True),
This would potentially apply to unclassified_display too. Although the previous monkeypatching didn't exclude banner.
| @@ -386,14 +386,14 @@ def _emit_event(self, | |||
| event_data = self._current_event_data | |||
| stdout_chunks = [buffered_stdout] | |||
| elif buffered_stdout: | |||
| event_data = dict({'event': 'verbose'}) | |||
| event_data = dict({'event': 'unclassified_display'}) | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
All of the CI failures appear to be related to this, where verbose is being excluded, or depended on. I'm not sure we can make this change, but I'd prefer to not just classify any unknown display event as verbose if possible.
| C.config.initialize_plugin_configuration_definitions( | ||
| 'callback', self._load_name, base_config | my_config | ||
| ) | ||
| return super().set_options(*args, **kwargs) |
There was a problem hiding this comment.
Not related, but since I'm in here making a mess, this fixes the options issue with callbacks not matching the default from a config perspective.
|
No description provided.