Make changes for displaying page listing all the blogs created by user.

[mediagoblin.git] / mediagoblin / processing / task.py

diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index d3770588dc6743273d7552d19cbe7ea8d2a2c557..7f68348566b5897b68d23c0c4a8b634c08b07edd 100644 (file)
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -18,7 +18,8 @@ import logging
 import urllib
 import urllib2
 
-from celery import registry, task
+import celery
+from celery.registry import tasks
 
 from mediagoblin import mg_globals as mgg
 from . import mark_entry_failed, BaseProcessingFail
@@ -30,7 +31,7 @@ logging.basicConfig()
 _log.setLevel(logging.DEBUG)
 
 
-@task.task(default_retry_delay=2 * 60)
+@celery.task(default_retry_delay=2 * 60)
 def handle_push_urls(feed_url):
     """Subtask, notifying the PuSH servers of new content
 
@@ -60,11 +61,11 @@ def handle_push_urls(feed_url):
                           'Giving up.'.format(feed_url))
                 return False
 
+
 ################################
 # Media processing initial steps
 ################################
-
-class ProcessMedia(task.Task):
+class ProcessMedia(celery.Task):
     """
     Pass this entry off for processing.
     """
@@ -93,7 +94,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 ;)
@@ -144,6 +156,4 @@ class ProcessMedia(task.Task):
         entry = mgg.database.MediaEntry.query.filter_by(id=entry_id).first()
         json_processing_callback(entry)
 
-# Register the task
-process_media = registry.tasks[ProcessMedia.name]
-
+tasks.register(ProcessMedia)