harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more queue api

Browse Source
This commit is contained in:
redmatrix 2015-12-15 00:04:30 -08:00
parent b13241564b
commit 6f2a5117dc
4 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/queue.php
View File

@ -114,20 +114,17 @@ function queue_run($argv, $argc){
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($rr['outq_hash']) dbesc($rr['outq_hash'])
); );
$y = q("delete from outq where outq_hash = '%s'", remove_queue_item($rr['outq_hash']);
dbesc($rr['outq_hash'])
);
} }
else { else {
logger('queue: queue post returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG); logger('queue: queue post returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'", update_queue_item($rr['outq_hash'],10);
dbesc(datetime_convert()),
dbesc($rr['outq_hash'])
);
$deadguys[] = $rr['outq_posturl']; $deadguys[] = $rr['outq_posturl'];
} }
continue; continue;
} }
$result = zot_zot($rr['outq_posturl'],$rr['outq_notify']); $result = zot_zot($rr['outq_posturl'],$rr['outq_notify']);
if($result['success']) { if($result['success']) {
logger('queue: deliver zot success to ' . $rr['outq_posturl'], LOGGER_DEBUG); logger('queue: deliver zot success to ' . $rr['outq_posturl'], LOGGER_DEBUG);
@ -136,10 +133,7 @@ function queue_run($argv, $argc){
else { else {
$deadguys[] = $rr['outq_posturl']; $deadguys[] = $rr['outq_posturl'];
logger('queue: deliver zot returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG); logger('queue: deliver zot returned ' . $result['return_code'] . ' from ' . $rr['outq_posturl'],LOGGER_DEBUG);
$y = q("update outq set outq_updated = '%s', outq_priority = outq_priority + 10 where outq_hash = '%s'", update_queue_item($rr['outq_hash'],10);
dbesc(datetime_convert()),
dbesc($rr['outq_hash'])
);
} }
} }
} }

25
include/queue_fn.php
View File

@ -1,16 +1,29 @@
<?php /** @file */ <?php /** @file */
function update_queue_time($id) { function update_queue_time($id, $add_priority = 0) {
logger('queue: requeue item ' . $id); logger('queue: requeue item ' . $id,LOGGER_DEBUG);
q("UPDATE outq SET outq_updated = '%s' WHERE outq_hash = '%s'", q("UPDATE outq SET outq_updated = '%s', outq_priority = outq_priority + %d WHERE outq_hash = '%s'",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($add_priority),
dbesc($id) dbesc($id)
); );
} }
function remove_queue_item($id) { function remove_queue_item($id,$channel_id = 0) {
logger('queue: remove queue item ' . $id); logger('queue: remove queue item ' . $id,LOGGER_DEBUG);
q("DELETE FROM outq WHERE hash = '%s'", $sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
q("DELETE FROM outq WHERE outq_hash = '%s' $sql_extra",
dbesc($id)
);
}
function queue_set_delivered($id,$channel = 0) {
logger('queue: set delivered ' . $id,LOGGER_DEBUG);
$sql_extra = (($channel_id) ? " and outq_channel = " . intval($channel_id) . " " : '');
q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' $sql_extra ",
dbesc(datetime_convert()),
dbesc($id) dbesc($id)
); );
} }

16
include/zot.php
View File

@ -998,6 +998,8 @@ function zot_process_response($hub, $arr, $outq) {
} }
} }
// we have a more descriptive delivery report, so discard the per hub 'queued' report.
q("delete from dreport where dreport_queue = '%s' limit 1", q("delete from dreport where dreport_queue = '%s' limit 1",
dbesc($outq['outq_hash']) dbesc($outq['outq_hash'])
); );
@ -1012,18 +1014,8 @@ function zot_process_response($hub, $arr, $outq) {
// synchronous message types are handled immediately // synchronous message types are handled immediately
// async messages remain in the queue until processed. // async messages remain in the queue until processed.
if (intval($outq['outq_async'])) { if(intval($outq['outq_async']))
q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' and outq_channel = %d", queue_set_delivered($outq['outq_hash'],$outq['outq_channel']);
dbesc(datetime_convert()),
dbesc($outq['outq_hash']),
intval($outq['outq_channel'])
);
} else {
q("delete from outq where outq_hash = '%s' and outq_channel = %d",
dbesc($outq['outq_hash']),
intval($outq['outq_channel'])
);
}
logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG); logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG);
} }

2
version.inc
View File

@ -1 +1 @@
2015-12-14.1246 2015-12-15.1247