Enhance the database structure checks when they failed.

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 2cc16282344b3193e4971d931974ba28e0c6769e..3c28cefaf279bb76c8244f81ff7a6ed8cc4da1e0 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -46,7 +46,7 @@ function handle_pubsubhubbub() {
                        // 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;
 
@@ -66,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");
@@ -79,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();
@@ -111,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) {
@@ -120,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)
@@ -233,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;
 
 }