From 7d3fda06b03691601bc08b5d88baf1da1c3f83fc Mon Sep 17 00:00:00 2001 From: Rodney Ewing Date: Wed, 14 Aug 2013 14:54:10 -0700 Subject: [PATCH] catch processing exceptions and if entry_orig_state is processed, then ignore the exception --- mediagoblin/processing/task.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 ;) -- 2.25.1