jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

support hub.lease_seconds

Browse source 
- re-subscribe when we start to get close to the expiration
This commit is contained in:
Kyle Mahan 2015-02-27 08:16:15 -08:00
parent 903b4ce4ee
commit d7beee9843
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
woodwind/models.py
View file

@ -111,6 +111,7 @@ class Feed(db.Model):
push_hub = db.Column(db.String(512)) push_hub = db.Column(db.String(512))
push_topic = db.Column(db.String(512)) push_topic = db.Column(db.String(512))
push_verified = db.Column(db.Boolean) push_verified = db.Column(db.Boolean)
push_expiry = db.Column(db.DateTime)
last_pinged = db.Column(db.DateTime) last_pinged = db.Column(db.DateTime)
def get_feed_code(self): def get_feed_code(self):

8
woodwind/push.py
View file

@ -24,14 +24,18 @@ def notify(feed_id):
mode = request.args.get('hub.mode') mode = request.args.get('hub.mode')
topic = request.args.get('hub.topic') topic = request.args.get('hub.topic')
challenge = request.args.get('hub.challenge') challenge = request.args.get('hub.challenge')
lease_seconds = request.args.get('hub.lease_seconds')
current_app.logger.debug( current_app.logger.debug(
'PuSH verification. feed=%r, mode=%s, topic=%s, challenge=%s', 'PuSH verification. feed=%r, mode=%s, topic=%s, challenge=%s, lease_seconds=%s',
feed, mode, topic, challenge) feed, mode, topic, challenge, lease_seconds)
if mode == 'subscribe' and topic == feed.push_topic: if mode == 'subscribe' and topic == feed.push_topic:
current_app.logger.debug( current_app.logger.debug(
'PuSH verify subscribe for feed=%r, topic=%s', feed, topic) 'PuSH verify subscribe for feed=%r, topic=%s', feed, topic)
feed.push_verified = True feed.push_verified = True
if lease_seconds:
feed.push_expiry = datetime.datetime.utcnow() \
+ datetime.timedelta(seconds=int(lease_seconds))
db.session.commit() db.session.commit()
return challenge return challenge
elif mode == 'unsubscribe' and topic != feed.push_topic: elif mode == 'unsubscribe' and topic != feed.push_topic:

9
woodwind/tasks.py
View file

@ -133,12 +133,13 @@ def check_push_subscription(session, feed, response):
'hub.mode': mode, 'hub.mode': mode,
'hub.topic': topic, 'hub.topic': topic,
'hub.callback': build_callback_url(), 'hub.callback': build_callback_url(),
'hub.verify': 'async', # backcompat with 0.3 'hub.verify': 'async', # backcompat with 0.3
# TODO secret should only be used over HTTPS # TODO secret should only be used over HTTPS
# 'hub.secret': secret, # 'hub.secret': secret,
}) })
logger.debug('%s response %r', mode, r) logger.debug('%s response %r', mode, r)
expiry = feed.push_expiry
old_hub = feed.push_hub old_hub = feed.push_hub
old_topic = feed.push_topic old_topic = feed.push_topic
hub = response.links.get('hub', {}).get('url') hub = response.links.get('hub', {}).get('url')
@ -165,13 +166,15 @@ def check_push_subscription(session, feed, response):
topic = next((link['href'] for link in links topic = next((link['href'] for link in links
if 'self' in link['rel']), None) if 'self' in link['rel']), None)
if hub != old_hub or topic != old_topic or not feed.push_verified: if ((expiry and expiry - datetime.datetime.utcnow() <= UPDATE_INTERVAL)
or hub != old_hub or topic != old_topic or not feed.push_verified):
feed.push_hub = hub feed.push_hub = hub
feed.push_topic = topic feed.push_topic = topic
feed.push_verified = False feed.push_verified = False
feed.push_expiry = None
session.commit() session.commit()
if old_hub and old_topic: if old_hub and old_topic and hub != old_hub and topic != old_topic:
send_request('unsubscribe', old_hub, old_topic) send_request('unsubscribe', old_hub, old_topic)
if hub and topic: if hub and topic: