public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing PuSH by using the correct hub url. Thanks to @donmelton for finding the bug.

Browse source
This commit is contained in:
Samuel Clay 2013-01-22 18:15:22 -08:00
parent 9c8a102f04
commit bcc24c1253
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/push/models.py
View file

@ -73,8 +73,8 @@ class PushSubscriptionManager(models.Manager):
subscription = self.subscribe(extracted_topic.group(1), subscription = self.subscribe(extracted_topic.group(1),
feed=feed, hub=hub, force_retry=True) feed=feed, hub=hub, force_retry=True)
else: else:
logging.debug(u' ---> [%-30s] ~FR~BKFeed failed to subscribe to push: %s' % ( logging.debug(u' ---> [%-30s] ~FR~BKFeed failed to subscribe to push: %s (code: %s)' % (
unicode(subscription.feed)[:30], error)) unicode(subscription.feed)[:30], error, response and response.status_code))
subscription.save() subscription.save()
feed.setup_push() feed.setup_push()

6
utils/feed_fetcher.py
View file

@ -59,8 +59,8 @@ class FetchFeed:
etag = None etag = None
USER_AGENT = 'NewsBlur Feed Fetcher - %s subscriber%s - %s (Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.2.3 (KHTML, like Gecko) Version/5.2)' % ( USER_AGENT = 'NewsBlur Feed Fetcher - %s subscriber%s - %s (Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.2.3 (KHTML, like Gecko) Version/5.2)' % (
self.feed.num_subscribers, f.num_subscribers,
's' if self.feed.num_subscribers != 1 else '', 's' if f.num_subscribers != 1 else '',
settings.NEWSBLUR_URL settings.NEWSBLUR_URL
) )
if self.options.get('feed_xml'): if self.options.get('feed_xml'):
@ -231,7 +231,7 @@ class ProcessFeed:
hub_url = None hub_url = None
self_url = self.feed.feed_address self_url = self.feed.feed_address
for link in self.fpf.feed.links: for link in self.fpf.feed.links:
if link['rel'] == 'hub': if link['rel'] == 'hub' and not hub_url:
hub_url = link['href'] hub_url = link['href']
elif link['rel'] == 'self': elif link['rel'] == 'self':
self_url = link['href'] self_url = link['href']