strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove item from queue

Browse source
This commit is contained in:
Friendika 2011-08-28 22:59:49 -07:00
parent 846c4cea7c
commit b61d535f81
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/delivery.php
View file

@ -37,6 +37,19 @@ function delivery_run($argv, $argc){
$item_id = intval($argv[2]); $item_id = intval($argv[2]);
$contact_id = intval($argv[3]); $contact_id = intval($argv[3]);
// Some other process may have delivered this item already.
$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
dbesc($cmd),
dbesc($item_id),
dbesc($contact_id)
);
if(! count($r)) {
return;
}
// It's ours to deliver. Remove it from the queue.
q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1", q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
dbesc($cmd), dbesc($cmd),
dbesc($item_id), dbesc($item_id),

21
include/queue.php
View file

@ -3,18 +3,18 @@ require_once("boot.php");
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
function queue_run($argv, $argc){ function queue_run($argv, $argc){
global $a, $db; global $a, $db;
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("dba.php"); require_once("dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
require_once("session.php"); require_once("session.php");
@ -42,7 +42,6 @@ function queue_run($argv, $argc){
if(! $interval) if(! $interval)
$interval = 2; $interval = 2;
$r = q("select * from deliverq where 1"); $r = q("select * from deliverq where 1");
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {