Merge branch 'mediagoblin-upstream' into feature544_basic_license_data

This commit is contained in:
Aaron Williamson
2012-01-18 20:40:18 -05:00
4 changed files with 73 additions and 6 deletions

View File

@@ -20,6 +20,10 @@ from os.path import splitext
from cgi import FieldStorage
from celery import registry
import urllib,urllib2
import logging
_log = logging.getLogger(__name__)
from werkzeug.utils import secure_filename
@@ -129,6 +133,30 @@ def submit_start(request):
# re-raise the exception
raise
if mg_globals.app_config["push_urls"]:
feed_url=request.urlgen(
'mediagoblin.user_pages.atom_feed',
qualified=True,user=request.user.username)
hubparameters = {
'hub.mode': 'publish',
'hub.url': feed_url}
hubdata = urllib.urlencode(hubparameters)
hubheaders = {
"Content-type": "application/x-www-form-urlencoded",
"Connection": "close"}
for huburl in mg_globals.app_config["push_urls"]:
hubrequest = urllib2.Request(huburl, hubdata, hubheaders)
try:
hubresponse = urllib2.urlopen(hubrequest)
except urllib2.HTTPError as exc:
# This is not a big issue, the item will be fetched
# by the PuSH server next time we hit it
_log.warning(
"push url %r gave error %r", huburl, exc.code)
except urllib2.URLError as exc:
_log.warning(
"push url %r is unreachable %r", huburl, exc.reason)
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
return redirect(request, "mediagoblin.user_pages.user_home",