keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Queue: using lockpath, so that the queue only can run once a time.

Browse source
This commit is contained in:
Michael Vogel 2014-03-16 17:37:20 +01:00
parent 49e16b0612
commit 32065dfad6
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/queue.php
View file

@ -46,7 +46,7 @@ function handle_pubsubhubbub() {
// we use the push variable also as a counter, if we failed we // we use the push variable also as a counter, if we failed we
// increment this until some upper limit where we give up // increment this until some upper limit where we give up
$new_push = intval($rr['push']) + 1; $new_push = intval($rr['push']) + 1;
if ($new_push > 30) // OK, let's give up if ($new_push > 30) // OK, let's give up
$new_push = 0; $new_push = 0;
@ -66,7 +66,7 @@ function queue_run(&$argv, &$argc){
if(is_null($a)){ if(is_null($a)){
$a = new App; $a = new App;
} }
if(is_null($db)){ if(is_null($db)){
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
@ -79,10 +79,20 @@ function queue_run(&$argv, &$argc){
require_once("include/datetime.php"); require_once("include/datetime.php");
require_once('include/items.php'); require_once('include/items.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
require_once('include/pidfile.php');
load_config('config'); load_config('config');
load_config('system'); load_config('system');
$lockpath = get_config('system','lockpath');
if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'queue.lck');
if($pidfile->is_already_running()) {
logger("queue: Already running");
return;
}
}
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(get_config('system','url'));
load_hooks(); load_hooks();
@ -120,7 +130,7 @@ function queue_run(&$argv, &$argc){
} }
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
} }
if($queue_id) { if($queue_id) {
$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1", $r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id) intval($queue_id)
@ -233,17 +243,17 @@ function queue_run(&$argv, &$argc){
default: default:
$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false); $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
call_hooks('queue_deliver', $a, $params); call_hooks('queue_deliver', $a, $params);
if($params['result']) if($params['result'])
remove_queue_item($q_item['id']); remove_queue_item($q_item['id']);
else else
update_queue_time($q_item['id']); update_queue_time($q_item['id']);
break; break;
} }
} }
return; return;
} }