diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index b9b6ecc092..7a2542f9f2 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -1173,7 +1173,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique def websocket_emit_data(self): ''' Return extra data that should be included when submitting data to the browser over the websocket connection ''' - websocket_data = dict() + websocket_data = dict(type=self.get_real_instance_class()._meta.verbose_name.replace(' ', '_')) if self.spawned_by_workflow: websocket_data.update(dict(workflow_job_id=self.workflow_job_id, workflow_node_id=self.workflow_node_id)) diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 5c0f277cfb..ca047141be 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -685,7 +685,7 @@ class WorkflowApproval(UnifiedJob): self.status = 'successful' self.save() changes = model_to_dict(self, model_serializer_mapping()) - changes['status']=['pending', 'successful'] + changes['status'] = ['pending', 'successful'] activity_entry = ActivityStream( operation='update', object1='workflow_approval', @@ -702,7 +702,7 @@ class WorkflowApproval(UnifiedJob): self.status = 'failed' self.save() changes = model_to_dict(self, model_serializer_mapping()) - changes['status']=['pending', 'failed'] + changes['status'] = ['pending', 'failed'] activity_entry = ActivityStream( operation='update', object1='workflow_approval', diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index 82bafeaadd..c3d129cf46 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -527,7 +527,7 @@ class TaskManager(): if task.timeout == 0: continue if (now - task.created) >= approval_timeout_seconds: - logger.info("The approval node {} ({}) has expired after {} seconds.".format(task.name, task.pk, task.timeout)) + logger.warn("The approval node {} ({}) has expired after {} seconds.".format(task.name, task.pk, task.timeout)) task.timed_out = True task.status = 'failed' task.job_explanation = _("This approval node has timed out.")