From: Rodney Ewing <ewing.rj@gmail.com>
Date: Mon, 19 Aug 2013 21:57:00 +0000 (-0700)
Subject: - need self.metadata with BaseProcessingFail
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d4ae4c9f971b5795f1697f443b359d3155a16013;p=mediagoblin.git

- 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 5e463d45..bdedec2e 100644
--- 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 bb09daec..05cac844 100644
--- 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)