External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 03:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

converting from socketio to channels websocket

Browse Source
This commit is contained in:
Wayne Witzel III
2016-08-11 15:06:07 -04:00
committed by Jared Tabor
parent 1a9843d5d1
commit 6d4a2a8f8e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/models/jobs.py
View File

@@ -1409,4 +1409,3 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
def get_notification_friendly_name(self): def get_notification_friendly_name(self):
return "System Job" return "System Job"

1
awx/main/models/unified_jobs.py
View File

@@ -932,4 +932,3 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
if settings.BROKER_URL.startswith('amqp://'): if settings.BROKER_URL.startswith('amqp://'):
self._force_cancel() self._force_cancel()
return self.cancel_flag return self.cancel_flag

6
awx/main/scheduler/__init__.py
View File

@@ -122,7 +122,7 @@ def rebuild_graph():
logger.debug("Active celery tasks: " + str(active_tasks)) logger.debug("Active celery tasks: " + str(active_tasks))
for task in list(running_celery_tasks): for task in list(running_celery_tasks):
if (task.celery_task_id not in active_tasks and not hasattr(settings, 'IGNORE_CELERY_INSPECTOR')): if (task.celery_task_id not in active_tasks and not hasattr(settings, 'IGNORE_CELERY_INSPECTOR')):
# NOTE: Pull status again and make sure it didn't finish in # NOTE: Pull status again and make sure it didn't finish in
# the meantime? # the meantime?
task.status = 'failed' task.status = 'failed'
task.job_explanation += ' '.join(( task.job_explanation += ' '.join((
@@ -204,7 +204,7 @@ def process_graph(graph, task_capacity):
node_type = graph.get_node_type(node_obj) node_type = graph.get_node_type(node_obj)
if node_type == 'job': if node_type == 'job':
# clear dependencies because a job can block (not necessarily # clear dependencies because a job can block (not necessarily
# depend) on other jobs that share the same job template # depend) on other jobs that share the same job template
node_dependencies = [] node_dependencies = []
@@ -217,7 +217,7 @@ def process_graph(graph, task_capacity):
node_obj.start() node_obj.start()
spawn_workflow_graph_jobs([node_obj]) spawn_workflow_graph_jobs([node_obj])
return process_graph(graph, task_capacity) return process_graph(graph, task_capacity)
dependent_nodes = [{'type': graph.get_node_type(node_obj), 'id': node_obj.id}] + \ dependent_nodes = [{'type': graph.get_node_type(node_obj), 'id': node_obj.id}] + \
[{'type': graph.get_node_type(n['node_object']), [{'type': graph.get_node_type(n['node_object']),
'id': n['node_object'].id} for n in node_dependencies] 'id': n['node_object'].id} for n in node_dependencies]