Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion awx/main/tasks/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1966,7 +1966,7 @@ def post_run_hook(self, inventory_update, status):
raise
except Exception:
logger.exception('Exception saving {} content, rolling back changes.'.format(inventory_update.log_format))
raise PostRunError('Error occured while saving inventory data, see traceback or server logs', status='error', tb=traceback.format_exc())
raise PostRunError('Error occurred while saving inventory data, see traceback or server logs', status='error', tb=traceback.format_exc())


@task(queue=get_task_queuename)
Expand Down
4 changes: 2 additions & 2 deletions awx/main/tasks/receptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def _run_internal(self, receptor_ctl):
# We do not programatically handle this case. Ideally, we would handle this with a reaper case.
# The two distinct job lifecycle log events below allow for us to at least detect when this
# edge case occurs. If the lifecycle event work_unit_id_received occurs without the
# work_unit_id_assigned event then this case may have occured.
# work_unit_id_assigned event then this case may have occurred.
self.task.instance.work_unit_id = result['unitid'] # Set work_unit_id in-memory only
self.task.instance.log_lifecycle("work_unit_id_received")
self.task.update_model(self.task.instance.pk, work_unit_id=result['unitid'])
Expand Down Expand Up @@ -520,7 +520,7 @@ def _run_internal(self, receptor_ctl):
signal_state.raise_exception = False

if res.status == 'error':
# If ansible-runner ran, but an error occured at runtime, the traceback information
# If ansible-runner ran, but an error occurred at runtime, the traceback information
# is saved via the status_handler passed in to the processor.
if 'result_traceback' in self.task.runner_callback.extra_update_fields:
return res
Expand Down
4 changes: 2 additions & 2 deletions awx_collection/plugins/module_utils/controller_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,10 @@ def load_config(self, config_path):
pass

except Exception as e:
raise_from(ConfigFileException("An unknown exception occured trying to ini load config file: {0}".format(e)), e)
raise_from(ConfigFileException("An unknown exception occurred trying to ini load config file: {0}".format(e)), e)

except Exception as e:
raise_from(ConfigFileException("An unknown exception occured trying to load config file: {0}".format(e)), e)
raise_from(ConfigFileException("An unknown exception occurred trying to load config file: {0}".format(e)), e)

# If we made it here, we have a dict which has values in it from our config, any final settings logic can be performed here
for honorred_setting in self.short_params:
Expand Down
Loading