aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init/celery
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2011-11-21 23:18:40 +0100
committerJoar Wandborg <git@wandborg.com>2011-11-21 23:18:40 +0100
commit8e5f974684ce4e329a5022459f2e536fa4e15edd (patch)
treebcc21c0daa387deb1fd088c95024738c6d7feec5 /mediagoblin/init/celery
parentb9e1fa280edfff4daf424bbcf51bd651ed00f411 (diff)
downloadmediagoblin-8e5f974684ce4e329a5022459f2e536fa4e15edd.tar.lz
mediagoblin-8e5f974684ce4e329a5022459f2e536fa4e15edd.tar.xz
mediagoblin-8e5f974684ce4e329a5022459f2e536fa4e15edd.zip
Fixes after merging video branch into master
- Removed debug output from init/celery - Moved process_media/__init__ to processing.py - Centralized the processing.ProcessMedia task class - Updated media managers to reference the processing function instead of the ProcessMedia instance - Updated new-style image processing to previous, newer old-style image processing - Updated video transcoding - Changed method in progress output, sometimes message.structure['percent'] raises KeyError
Diffstat (limited to 'mediagoblin/init/celery')
-rw-r--r--mediagoblin/init/celery/__init__.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index a62d40e3..1eb21d7a 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -18,9 +18,7 @@ import os
import sys
-MANDATORY_CELERY_IMPORTS = ['mediagoblin.process_media']
-
-print(MANDATORY_CELERY_IMPORTS)
+MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing']
DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module'