Commit f345f1d6 authored by mmn's avatar mmn

Merge branch 'renew-pshb' into 'master'

Actually use the renew code

We have the code to check once a day and renew, but currently it's
just in a script directory.  This change adds an event listener
hook to check and renew subscriptions daily.

Closes #83

See merge request !38
parents deb5275c 4b31bc3f
......@@ -104,6 +104,9 @@ class OStatusPlugin extends Plugin
// Incoming from a foreign PuSH hub
$qm->connect('pushin', 'PushInQueueHandler');
// Re-subscribe feeds that need renewal
$qm->connect('pushrenew', 'PushRenewQueueHandler');
return true;
}
......@@ -1351,4 +1354,20 @@ class OStatusPlugin extends Plugin
}
return true;
}
public function onCronDaily()
{
try {
$sub = FeedSub::renewalCheck();
} catch (NoResultException $e) {
common_log(LOG_INFO, "There were no expiring feeds.");
return;
}
$qm = QueueManager::get();
while ($sub->fetch()) {
$item = array('feedsub_id' => $sub->id);
$qm->enqueue($item, 'pushrenew');
}
}
}
......@@ -295,7 +295,7 @@ class FeedSub extends Managed_DataObject
{
$fs = new FeedSub();
// the "" empty string check is because we historically haven't saved unsubscribed feeds as NULL
$fs->whereAdd('sub_end IS NOT NULL AND sub_end!="" AND sub_end < NOW() - INTERVAL 1 day');
$fs->whereAdd('sub_end IS NOT NULL AND sub_end!="" AND sub_end < NOW() + INTERVAL 1 day');
if (!$fs->find()) { // find can be both false and 0, depending on why nothing was found
throw new NoResultException($fs);
}
......
<?php
/*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('STATUSNET')) {
exit(1);
}
/**
* Renew an expiring feedsub
* @package FeedSub
* @author Stephen Paul Weber <singpolyma@singpolyma.net>
*/
class PushRenewQueueHandler extends QueueHandler
{
function transport()
{
return 'pushrenew';
}
function handle($data)
{
$feedsub_id = $data['feedsub_id'];
$feedsub = FeedSub::getKV('id', $feedsub_id);
if ($feedsub instanceof FeedSub) {
try {
common_log(LOG_INFO, "Renewing feed subscription\n\tExp.: {$feedsub->sub_end}\n\tFeed: {$feedsub->uri}\n\tHub: {$feedsub->huburi}");
$feedsub->renew();
} catch(Exception $e) {
common_log(LOG_ERR, "Exception during PuSH renew processing for $feedsub->uri: " . $e->getMessage());
}
} else {
common_log(LOG_ERR, "Discarding renew for unknown feed subscription id $feedsub_id");
}
return true;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment