aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-09-25 01:06:25 +0200
committerJoar Wandborg <git@wandborg.com>2012-09-26 23:53:51 +0200
commit939d57a022daa8f1f08dcfd111385225ca6030f6 (patch)
tree9e2f1c2359431a42e4a445f8ef34a35d0c0c7e63 /mediagoblin/processing
parent5354f954dc94aafd35bc037faad2412f73320d8c (diff)
downloadmediagoblin-939d57a022daa8f1f08dcfd111385225ca6030f6.tar.lz
mediagoblin-939d57a022daa8f1f08dcfd111385225ca6030f6.tar.xz
mediagoblin-939d57a022daa8f1f08dcfd111385225ca6030f6.zip
HTTP callback fixes
- Added HTTPError catching around the callback request, to not mark the entry as failed, just log the exception. - Fixed bug where I forgot to actually fetch the entry before passing it to json_processing_callback. - Changed __main__ migration #6 to create the ProcessingMetaData table as it is currently, to prevent possible breakage if a siteadmin is lagging behind with his db migrations and more than one migration wants to fix stuff with the ProcessingMetaData table.
Diffstat (limited to 'mediagoblin/processing')
-rw-r--r--mediagoblin/processing/task.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 7f4b8429..187b893d 100644
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -96,5 +96,5 @@ class ProcessMedia(Task):
entry_id = args[0]
mark_entry_failed(entry_id, exc)
- entry = mgg.database.MediaEntry.query.filter_by(id=entry_id)
+ entry = mgg.database.MediaEntry.query.filter_by(id=entry_id).first()
json_processing_callback(entry)