Merge pull request #1033 from annando/master

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index ba3babe70dd3c4538876dc691dba385edebfafc6..3c28cefaf279bb76c8244f81ff7a6ed8cc4da1e0 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,29 +2,103 @@
 require_once("boot.php");
 require_once('include/queue_fn.php');
 
-function queue_run($argv, $argc){
+function handle_pubsubhubbub() {
+       global $a, $db;
+
+       logger('queue [pubsubhubbub]: start');
+
+       // 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");
+
+       foreach($r as $rr) {
+               $params = get_feed_for($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);
+
+               logger('queue [pubsubhubbub]: POST', $headers);
+
+               post_url($rr['callback_url'], $params, $headers);
+               $ret = $a->get_curl_code();
+
+               if ($ret >= 200 && $ret <= 299) {
+                       logger('queue [pubsubhubbub]: 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']));
+
+               } else {
+                       logger('queue [pubsubhubbub]: 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;
+
+                       if ($new_push > 30) // OK, let's give up
+                               $new_push = 0;
+
+                       q("UPDATE `push_subscriber` SET `push` = %d, last_update = '%s' " .
+                         "WHERE id = %d",
+                         $new_push,
+                         dbesc($date_now),
+                         intval($rr['id']));
+               }
+       }
+}
+
+
+function queue_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)){
                $a = new App;
        }
-  
+
        if(is_null($db)){
                @include(".htconfig.php");
-               require_once("dba.php");
+               require_once("include/dba.php");
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
 
-       require_once("session.php");
-       require_once("datetime.php");
+       require_once("include/session.php");
+       require_once("include/datetime.php");
        require_once('include/items.php');
        require_once('include/bbcode.php');
+       require_once('include/pidfile.php');
 
        load_config('config');
        load_config('system');
 
+       $lockpath = get_lockpath();
+       if ($lockpath != '') {
+               $pidfile = new pidfile($lockpath, 'queue');
+               if($pidfile->is_already_running()) {
+                       logger("queue: Already running");
+                       if ($pidfile->running_time() > 9*60) {
+                               $pidfile->kill();
+                               logger("queue: killed stale process");
+                               // Calling a new instance
+                               proc_run('php',"include/queue.php");
+                       }
+                       return;
+               }
+       }
+
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();
@@ -38,10 +112,12 @@ function queue_run($argv, $argc){
 
        logger('queue: start');
 
+       handle_pubsubhubbub();
+
        $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
        $r = q("select * from deliverq where 1");
-       if(count($r)) {
+       if($r) {
                foreach($r as $rr) {
                        logger('queue: deliverq');
                        proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
@@ -51,16 +127,16 @@ function queue_run($argv, $argc){
        }
 
        $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
-               LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+               INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
                WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-       if(count($r)) {
+       if($r) {
                foreach($r as $rr) {
                        logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
                        logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
                }
                q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
        }
-               
+
        if($queue_id) {
                $r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
                        intval($queue_id)
@@ -73,7 +149,7 @@ function queue_run($argv, $argc){
 
                $r = q("SELECT `id` FROM `queue` WHERE (( `created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ) OR ( `last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR ))");
        }
-       if(! count($r)){
+       if(! $r){
                return;
        }
 
@@ -173,17 +249,17 @@ function queue_run($argv, $argc){
                        default:
                                $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
                                call_hooks('queue_deliver', $a, $params);
-               
+
                                if($params['result'])
                                                remove_queue_item($q_item['id']);
                                else
                                                update_queue_time($q_item['id']);
-       
+
                                break;
 
                }
        }
-               
+
        return;
 
 }