aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorvijeth-aradhya <vijthaaa@gmail.com>2017-06-11 19:07:58 +0530
committervijeth-aradhya <vijthaaa@gmail.com>2017-06-11 19:07:58 +0530
commit9a27fa60a42cd39596cb8c4bb0331279b998bae7 (patch)
treedf62e400a84abfd9bcb9e047685e506b3c7f8dc6 /mediagoblin/media_types
parentdd0db38e2c26f8601f92b0c91f1d24a2b8e71b7e (diff)
downloadmediagoblin-9a27fa60a42cd39596cb8c4bb0331279b998bae7.tar.lz
mediagoblin-9a27fa60a42cd39596cb8c4bb0331279b998bae7.tar.xz
mediagoblin-9a27fa60a42cd39596cb8c4bb0331279b998bae7.zip
Add additional celery config settings
Fixes older webm_video backward compatibilty issue. Add 'default' queue to be used from now. Add other necessary celery settings for priority.
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/video/processing.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py
index 4dee8d55..5cae42f5 100644
--- a/mediagoblin/media_types/video/processing.py
+++ b/mediagoblin/media_types/video/processing.py
@@ -18,6 +18,7 @@ import argparse
import os.path
import logging
import datetime
+import celery
import six
@@ -163,6 +164,7 @@ def store_metadata(media_entry, metadata):
# =====================
+@celery.task()
def main_task(**process_info):
processor = CommonVideoProcessor(process_info['manager'], process_info['entry'])
processor.common_setup(process_info['resolution'])
@@ -172,6 +174,7 @@ def main_task(**process_info):
processor.store_orig_metadata()
+@celery.task()
def complimentary_task(**process_info):
processor = CommonVideoProcessor(process_info['manager'], process_info['entry'])
processor.common_setup(process_info['resolution'])
@@ -179,6 +182,7 @@ def complimentary_task(**process_info):
vp8_threads=process_info['vp8_threads'], vorbis_quality=process_info['vorbis_quality'])
+@celery.task()
def processing_cleanup(**process_info):
processor = CommonVideoProcessor(process_info['manager'], process_info['entry'])
processor.delete_queue_file()
@@ -408,7 +412,6 @@ class InitialProcessor(CommonVideoProcessor):
self.transcode(medium_size=medium_size, vp8_quality=vp8_quality,
vp8_threads=vp8_threads, vorbis_quality=vorbis_quality)
- self.copy_original()
self.generate_thumb(thumb_size=thumb_size)
self.delete_queue_file()