summaryrefslogtreecommitdiff
path: root/plugins/OStatus/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-21 17:00:19 -0500
committerEvan Prodromou <evan@status.net>2010-02-21 17:00:19 -0500
commit37179a91d5e176a743453cf27de606553bd62f36 (patch)
tree733564a9284a8edd44e043af529e11efc42ff118 /plugins/OStatus/actions
parent1c22bf20f1e99664b02d71318592b73e7fb4d4b5 (diff)
parent5349aa420ed45c2f5bf773d10c7709826ae6babd (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r--plugins/OStatus/actions/pushcallback.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 7e1227a66..9e976a80d 100644
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -60,9 +60,14 @@ class PushCallbackAction extends Action
$post = file_get_contents('php://input');
- // @fixme Queue this to a background process; we should return
+ // Queue this to a background process; we should return
// as quickly as possible from a distribution POST.
- $feedsub->receive($post, $hmac);
+ // If queues are disabled this'll process immediately.
+ $data = array('feedsub_id' => $feedsub->id,
+ 'post' => $post,
+ 'hmac' => $hmac);
+ $qm = QueueManager::get();
+ $qm->enqueue($data, 'pushinput');
}
/**