aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-08-14 14:54:10 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-08-16 15:30:22 -0700
commit7d3fda06b03691601bc08b5d88baf1da1c3f83fc (patch)
tree461682dcd834478be611549bc6a5ea7f94a08fea /mediagoblin/processing
parent79f84d7e479f6b370709c6826c85070ab1996ea6 (diff)
downloadmediagoblin-7d3fda06b03691601bc08b5d88baf1da1c3f83fc.tar.lz
mediagoblin-7d3fda06b03691601bc08b5d88baf1da1c3f83fc.tar.xz
mediagoblin-7d3fda06b03691601bc08b5d88baf1da1c3f83fc.zip
catch processing exceptions and if entry_orig_state is processed, then ignore the exception
Diffstat (limited to 'mediagoblin/processing')
-rw-r--r--mediagoblin/processing/task.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index d3770588..df44dd7a 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -93,7 +93,18 @@ class ProcessMedia(task.Task):
_log.debug('Processing {0}'.format(entry))
- processor.process(**reprocess_info)
+ try:
+ processor.process(**reprocess_info)
+ except Exception as exc:
+ if processor.entry_orig_state == 'processed':
+ _log.error(
+ 'Entry {0} failed to process due to the following'
+ ' error: {1}'.format(entry.id, exc))
+ _log.info(
+ 'Setting entry.state back to "processed"')
+ pass
+ else:
+ raise
# 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 ;)