pubsubpublish is now split into separate calls per entry.

diff --git a/include/notifier.php b/include/notifier.php
index cfe4e184120cb7c5307e537782e0ba87db14a2e5..0610a4e398df5a9baba95ba58e4e9df7a6927b03 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -642,8 +642,8 @@ function notifier_run(&$argv, &$argc){
                                if ($h === '[internal]') {
                                        // Set push flag for PuSH subscribers to this topic,
                                        // they will be notified in queue.php
-                                       q("UPDATE `push_subscriber` SET `push` = 1 " .
-                                         "WHERE `nickname` = '%s'", dbesc($owner['nickname']));
+                                       q("UPDATE `push_subscriber` SET `push` = 1 ".
+                                         "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
 
                                        logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 

diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 625eefc261b69af08b4011d44265ffd1ddb61a1f..85637facb23b275eac29a46c0d61c89aa35621b9 100644 (file)
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -2,60 +2,57 @@
 require_once("boot.php");
 require_once("include/ostatus.php");
 
-function handle_pubsubhubbub() {
-       global $a, $db;
-
-       logger('start');
+use \Friendica\Core\Config;
+use \Friendica\Core\PConfig;
 
-       // We'll push to each subscriber that has push > 0,
-       // i.e. there has been an update (set in notifier.php).
-
-       $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
+function handle_pubsubhubbub($id) {
+       global $a, $db;
 
-       foreach($r as $rr) {
+       $r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
+       if (!$r)
+               return;
+       else
+               $rr = $r[0];
 
-               logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
+       logger("Generate feed of user ".$rr['nickname']." to ".$rr['callback_url']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
 
-               $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
-               $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
+       $params = ostatus::feed($a, $rr['nickname'], $rr['last_update']);
+       $hmac_sig = hash_hmac("sha1", $params, $rr['secret']);
 
-               $headers = array("Content-type: application/atom+xml",
-                               sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-                                       $a->get_baseurl().'/pubsubhubbub',
-                                       $rr['topic']),
-                               "X-Hub-Signature: sha1=".$hmac_sig);
+       $headers = array("Content-type: application/atom+xml",
+                       sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
+                               $a->get_baseurl().'/pubsubhubbub',
+                               $rr['topic']),
+                       "X-Hub-Signature: sha1=".$hmac_sig);
 
-               logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
+       logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG);
 
-               post_url($rr['callback_url'], $params, $headers);
-               $ret = $a->get_curl_code();
+       post_url($rr['callback_url'], $params, $headers);
+       $ret = $a->get_curl_code();
 
-               if ($ret >= 200 && $ret <= 299) {
-                       logger('successfully pushed to '.$rr['callback_url']);
+       if ($ret >= 200 && $ret <= 299) {
+               logger('successfully pushed to '.$rr['callback_url']);
 
-                       // set last_update to "now", and reset push=0
-                       $date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
-                       q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
-                               dbesc($date_now),
-                               intval($rr['id']));
+               // set last_update to "now", and reset push=0
+               $date_now = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+               q("UPDATE `push_subscriber` SET `push` = 0, last_update = '%s' WHERE id = %d",
+                       dbesc($date_now),
+                       intval($rr['id']));
 
-               } else {
-                       logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
+       } else {
+               logger('error when pushing to '.$rr['callback_url'].' HTTP: '.$ret);
 
-                       // we use the push variable also as a counter, if we failed we
-                       // increment this until some upper limit where we give up
-                       $new_push = intval($rr['push']) + 1;
+               // we use the push variable also as a counter, if we failed we
+               // increment this until some upper limit where we give up
+               $new_push = intval($rr['push']) + 1;
 
-                       if ($new_push > 30) // OK, let's give up
-                               $new_push = 0;
+               if ($new_push > 30) // OK, let's give up
+                       $new_push = 0;
 
-                       q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
-                               $new_push,
-                               intval($rr['id']));
-               }
+               q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
+                       $new_push,
+                       intval($rr['id']));
        }
-
-       logger('done');
 }
 
 
@@ -89,10 +86,28 @@ function pubsubpublish_run(&$argv, &$argc){
 
        if($argc > 1)
                $pubsubpublish_id = intval($argv[1]);
-       else
-               $pubsubpublish_id = 0;
+       else {
+               // We'll push to each subscriber that has push > 0,
+               // i.e. there has been an update (set in notifier.php).
+               $r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0");
+
+               // Use the delivery interval that is also used for the notifier
+               $interval = Config::get("system", "delivery_interval", 2);
+
+               // If we are using the worker we don't need a delivery interval
+               if (get_config("system", "worker"))
+                       $interval = false;
+
+               foreach($r as $rr) {
+                       logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
+                       proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);
+
+                       if($interval)
+                               @time_sleep_until(microtime(true) + (float) $interval);
+               }
+       }
 
-       handle_pubsubhubbub();
+       handle_pubsubhubbub($pubsubpublish_id);
 
        return;