Enhance the database structure checks when they failed.

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 5d30ab138dfc807622274cbbf6c0b4ff56419080..3c28cefaf279bb76c8244f81ff7a6ed8cc4da1e0 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -7,10 +7,10 @@ function handle_pubsubhubbub() {
 
        logger('queue [pubsubhubbub]: start');
 
-       // We'll push to each subscriber that has the push flag set,
+       // 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` = 1");
+       $r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
 
        foreach($r as $rr) {
                $params = get_feed_for($a, '', $rr['nickname'], $rr['last_update']);
@@ -31,17 +31,30 @@ function handle_pubsubhubbub() {
                if ($ret >= 200 && $ret <= 299) {
                        logger('queue [pubsubhubbub]: successfully pushed to ' .
                                   $rr['callback_url']);
-                       // here we should set push = 0 and update last_update to 'now'
+
+                       // 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);
-                       // here we should set update some retry counter
-                       // or cancel if counter is too high, remove subscription?
+
+                       // 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']));
                }
        }
 }
@@ -53,7 +66,7 @@ function queue_run(&$argv, &$argc){
        if(is_null($a)){
                $a = new App;
        }
-  
+
        if(is_null($db)){
                @include(".htconfig.php");
                require_once("include/dba.php");
@@ -66,10 +79,26 @@ function queue_run(&$argv, &$argc){
        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();
@@ -98,7 +127,7 @@ 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($r) {
                foreach($r as $rr) {
@@ -107,7 +136,7 @@ function queue_run(&$argv, &$argc){
                }
                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)
@@ -220,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;
 
 }