- need self.metadata with BaseProcessingFail

- pass feed_url into ProcessMedia run()

diff --git a/mediagoblin/db/models_v0.py b/mediagoblin/db/models_v0.py
index 5e463d452aafba69f963eabea98767a54d761a14..bdedec2e4b65070762432c9c9a0635eb47b6d318 100644 (file)
--- a/mediagoblin/db/models_v0.py
+++ b/mediagoblin/db/models_v0.py
@@ -109,7 +109,7 @@ class MediaEntry(Base_v0):
 
     queued_media_file = Column(PathTupleWithSlashes)
 
-    queued_task_id = Column(Unicode, default=None)
+    queued_task_id = Column(Unicode)
 
     __table_args__ = (
         UniqueConstraint('uploader', 'slug'),

diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index bb09daec70504e1345dc9ce77653e11ba82544e1..05cac844aa0ca0e7ccda4813f49bfb6039d6d3e6 100644 (file)
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -72,7 +72,7 @@ class ProcessMedia(celery.Task):
     """
     track_started=True
 
-    def run(self, media_id):
+    def run(self, media_id, feed_url):
         """
         Pass the media entry off to the appropriate processing function
         (for now just process_image...)
@@ -86,6 +86,7 @@ class ProcessMedia(celery.Task):
         try:
             entry.state = u'processing'
             entry.save()
+
             _log.debug('Processing {0}'.format(entry))
 
             proc_state = ProcessingState(entry)