aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorvijeth-aradhya <vijthaaa@gmail.com>2017-06-21 10:00:56 +0530
committervijeth-aradhya <vijthaaa@gmail.com>2017-06-21 10:03:40 +0530
commit602cfcb78916ac54bb415d9c2023124b6f3ad5b6 (patch)
tree042053d534d102679291020a035c56e2714e01cd /mediagoblin/media_types
parent5161533a6fb66e24f6906d6476069277d594e738 (diff)
downloadmediagoblin-602cfcb78916ac54bb415d9c2023124b6f3ad5b6.tar.lz
mediagoblin-602cfcb78916ac54bb415d9c2023124b6f3ad5b6.tar.xz
mediagoblin-602cfcb78916ac54bb415d9c2023124b6f3ad5b6.zip
Use tuple as default return type of workflow()
If None, then schedule the old Celery call, else the format is group and a single task in the tuple. Hence, Celery chord would be ideal to use. Closes #4
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/video/processing.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index 2a6a716f..ee2aa443 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -22,7 +22,7 @@ import celery
import six
-from celery import group, chord
+from celery import group
from mediagoblin import mg_globals as mgg
from mediagoblin.processing import (
FilenameBuilder, BaseProcessingFail,
@@ -585,7 +585,4 @@ class VideoProcessingManager(ProcessingManager):
cleanup_task = processing_cleanup.signature(args=(entry.id,),
queue='default', immutable=True)
- chord(transcoding_tasks)(cleanup_task)
-
- # Not sure what to return since we are scheduling the task here itself
- return 1
+ return (transcoding_tasks, cleanup_task)