diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-03-01 16:29:22 -0600 |
| commit | ed6344009abb31326acabe95449aaa449f66f4b4 (patch) | |
| tree | 03d65052d550b890074dde3c18857371be974f5c /mediagoblin/processing/task.py | |
| parent | 5c754fdaeeddb1bbeff165bbecb77e33b75b3c7d (diff) | |
| parent | b7a3798e1806eb52a244088fb600376ff25e0de9 (diff) | |
| download | mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.lz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.tar.xz mediagoblin-ed6344009abb31326acabe95449aaa449f66f4b4.zip | |
Merge branch 'master' into joar-skip_transcoding
Conflicts:
mediagoblin/config_spec.ini
Diffstat (limited to 'mediagoblin/processing/task.py')
| -rw-r--r-- | mediagoblin/processing/task.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index e9bbe084..aec50aab 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -22,7 +22,7 @@ from celery import registry, task from mediagoblin import mg_globals as mgg from mediagoblin.db.models import MediaEntry -from mediagoblin.processing import mark_entry_failed, BaseProcessingFail +from . import mark_entry_failed, BaseProcessingFail, ProcessingState from mediagoblin.tools.processing import json_processing_callback _log = logging.getLogger(__name__) @@ -85,8 +85,11 @@ class ProcessMedia(task.Task): _log.debug('Processing {0}'.format(entry)) - # run the processing code - entry.media_manager['processor'](entry) + proc_state = ProcessingState(entry) + with mgg.workbench_manager.create() as workbench: + proc_state.set_workbench(workbench) + # run the processing code + entry.media_manager['processor'](proc_state) # We set the state to processed and save the entry here so there's # no need to save at the end of the processing stage, probably ;) |