Bugfix: Warning because of undefined constant

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index b703f930b6b80fcef848608dd0826636a5ad8f28..cb5fe28ad9bc5e1fee4ab55fdcdb43f0b2c27ed4 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -8,23 +8,40 @@ function queue_run(&$argv, &$argc){
        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');
+       require_once('include/socgraph.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 +55,17 @@ function queue_run(&$argv, &$argc){
 
        logger('queue: start');
 
+       // Handling the pubsubhubbub requests
+       proc_run('php','include/pubsubpublish.php');
+
        $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
+       // If we are using the worker we don't need a delivery interval
+       if (get_config("system", "worker"))
+               $interval = false;
+
        $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']);
@@ -50,17 +74,17 @@ function queue_run(&$argv, &$argc){
                }
        }
 
-       $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
-               LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
+       $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
+               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)
@@ -69,11 +93,11 @@ function queue_run(&$argv, &$argc){
        else {
 
                // For the first 12 hours we'll try to deliver every 15 minutes
-               // After that, we'll only attempt delivery once per hour. 
+               // After that, we'll only attempt delivery once per hour.
 
                $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;
        }
 
@@ -88,7 +112,7 @@ function queue_run(&$argv, &$argc){
 
        foreach($r as $q_item) {
 
-               // queue_predeliver hooks may have changed the queue db details, 
+               // queue_predeliver hooks may have changed the queue db details,
                // so check again if this entry still needs processing
 
                if($queue_id) {
@@ -113,12 +137,18 @@ function queue_run(&$argv, &$argc){
                        continue;
                }
                if(in_array($c[0]['notify'],$deadguys)) {
-                               logger('queue: skipping known dead url: ' . $c[0]['notify']);
-                               update_queue_time($q_item['id']);
-                               continue;
+                       logger('queue: skipping known dead url: ' . $c[0]['notify']);
+                       update_queue_time($q_item['id']);
+                       continue;
+               }
+
+               if (!poco_reachable($c[0]['url'])) {
+                       logger('queue: skipping probably dead url: ' . $c[0]['url']);
+                       update_queue_time($q_item['id']);
+                       continue;
                }
 
-               $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
+               $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
                        FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($c[0]['uid'])
                );
@@ -173,22 +203,22 @@ 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']);
+                                       remove_queue_item($q_item['id']);
                                else
-                                               update_queue_time($q_item['id']);
-       
+                                       update_queue_time($q_item['id']);
+
                                break;
 
                }
        }
-               
+
        return;
 
 }
 
 if (array_search(__file__,get_included_files())===0){
-  queue_run($argv,$argc);
+  queue_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }