summaryrefslogtreecommitdiff
path: root/plugins/OStatus/classes/HubSub.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-01 18:46:34 -0800
committerBrion Vibber <brion@pobox.com>2010-03-01 18:46:34 -0800
commit680ace19665f064404ddb4723d9b41ab69c6e1bd (patch)
tree8c59db5ae424404f8b22152eecaaf9e3fa006350 /plugins/OStatus/classes/HubSub.php
parent3c0729786de07b25cba4c62d71079d6b96f71994 (diff)
High-priority OStatus fixes:
* PuSHing out to multiple client services could fail; only first callback got reached * Correction for re-sub request to a known sub
Diffstat (limited to 'plugins/OStatus/classes/HubSub.php')
-rw-r--r--plugins/OStatus/classes/HubSub.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index e599d83a9..3120a70f9 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -260,9 +260,15 @@ class HubSub extends Memcached_DataObject
$retries = intval(common_config('ostatus', 'hub_retries'));
}
- $data = array('sub' => clone($this),
+ // We dare not clone() as when the clone is discarded it'll
+ // destroy the result data for the parent query.
+ // @fixme use clone() again when it's safe to copy an
+ // individual item from a multi-item query again.
+ $sub = HubSub::staticGet($this->topic, $this->callback);
+ $data = array('sub' => $sub,
'atom' => $atom,
'retries' => $retries);
+ common_log(LOG_INFO, "Queuing PuSH: $this->topic to $this->callback");
$qm = QueueManager::get();
$qm->enqueue($data, 'hubout');
}