removed JobEventSerializer additions, consolidated migrations, swapped job_events and jobs channel updates

This commit is contained in:
Wayne Witzel III
2016-11-17 17:03:41 -05:00
parent 62d0b9fc98
commit cd084f5c60
6 changed files with 12 additions and 61 deletions
+6 -1
View File
@@ -792,7 +792,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 '''
return {}
return {'workflow_job_id': self.workflow_job_id}
def websocket_emit_status(self, status):
status_data = dict(unified_job_id=self.id, status=status)
@@ -800,6 +800,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
status_data['group_name'] = 'jobs'
emit_channel_notification('jobs-status_changed', status_data)
if self.spawned_by_workflow:
event_serialized['group_name'] = "workflow_events"
emit_channel_notification('workflow_events-' + str(self.workflow_job_id), status_data)
def notification_data(self):
return dict(id=self.id,
name=self.name,