GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Evan Prodromou 2010-02-21 21:39:50 -05:00
parent 912814fb7f ca2a88545d
commit 273c0e0363
5 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/atomnoticefeed.php
View File

@ -64,6 +64,11 @@ class AtomNoticeFeed extends Atom10Feed
'http://activitystrea.ms/spec/1.0/'
);
$this->addNamespace(
'poco',
'http://portablecontacts.net/spec/1.0'
);
// XXX: What should the uri be?
$this->addNamespace(
'ostatus',

1
plugins/OStatus/actions/pushcallback.php
View File

@ -29,6 +29,7 @@ class PushCallbackAction extends Action
{
function handle()
{
StatusNet::setApi(true); // Minimize error messages to aid in debugging
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();

47
plugins/OStatus/classes/HubSub.php
View File

@ -226,6 +226,26 @@ class HubSub extends Memcached_DataObject
return parent::insert();
}
/**
* Schedule delivery of a 'fat ping' to the subscriber's callback
* endpoint. If queues are disabled, this will run immediately.
*
* @param string $atom well-formed Atom feed
* @param int $retries optional count of retries if POST fails; defaults to hub_retries from config or 0 if unset
*/
function distribute($atom, $retries=null)
{
if ($retries === null) {
$retries = intval(common_config('ostatus', 'hub_retries'));
}
$data = array('sub' => clone($this),
'atom' => $atom,
'retries' => $retries);
$qm = QueueManager::get();
$qm->enqueue($data, 'hubout');
}
/**
* Send a 'fat ping' to the subscriber's callback endpoint
* containing the given Atom feed chunk.
@ -234,6 +254,7 @@ class HubSub extends Memcached_DataObject
* a higher level; don't just shove in a complete feed!
*
* @param string $atom well-formed Atom feed
* @throws Exception (HTTP or general)
*/
function push($atom)
{
@ -245,24 +266,18 @@ class HubSub extends Memcached_DataObject
$hmac = '(none)';
}
common_log(LOG_INFO, "About to push feed to $this->callback for $this->topic, HMAC $hmac");
try {
$request = new HTTPClient();
$request->setBody($atom);
$response = $request->post($this->callback, $headers);
if ($response->isOk()) {
return true;
}
common_log(LOG_ERR, "Error sending PuSH content " .
"to $this->callback for $this->topic: " .
$response->getStatus());
return false;
$request = new HTTPClient();
$request->setBody($atom);
$response = $request->post($this->callback, $headers);
} catch (Exception $e) {
common_log(LOG_ERR, "Error sending PuSH content " .
"to $this->callback for $this->topic: " .
$e->getMessage());
return false;
if ($response->isOk()) {
return true;
} else {
throw new Exception("Callback returned status: " .
$response->getStatus() .
"; body: " .
trim($response->getBody()));
}
}
}

5
plugins/OStatus/lib/hubdistribqueuehandler.php
View File

@ -124,10 +124,7 @@ class HubDistribQueueHandler extends QueueHandler
common_log(LOG_INFO, "Preparing $sub->N PuSH distribution(s) for $sub->topic");
$qm = QueueManager::get();
while ($sub->fetch()) {
common_log(LOG_INFO, "Prepping PuSH distribution to $sub->callback for $sub->topic");
$data = array('sub' => clone($sub),
'atom' => $atom);
$qm->enqueue($data, 'hubout');
$sub->distribute($atom);
}
}

18
plugins/OStatus/lib/huboutqueuehandler.php
View File

@ -33,6 +33,7 @@ class HubOutQueueHandler extends QueueHandler
{
$sub = $data['sub'];
$atom = $data['atom'];
$retries = $data['retries'];
assert($sub instanceof HubSub);
assert(is_string($atom));
@ -40,13 +41,20 @@ class HubOutQueueHandler extends QueueHandler
try {
$sub->push($atom);
} catch (Exception $e) {
common_log(LOG_ERR, "Failed PuSH to $sub->callback for $sub->topic: " .
$e->getMessage());
// @fixme Reschedule a later delivery?
return true;
$retries--;
$msg = "Failed PuSH to $sub->callback for $sub->topic: " .
$e->getMessage();
if ($retries > 0) {
common_log(LOG_ERR, "$msg; scheduling for $retries more tries");
// @fixme when we have infrastructure to schedule a retry
// after a delay, use it.
$sub->distribute($atom, $retries);
} else {
common_log(LOG_ERR, "$msg; discarding");
}
}
return true;
}
}