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

even more queue api

Browse Source
This commit is contained in:
redmatrix 2015-12-15 00:42:19 -08:00
parent 6f2a5117dc
commit ba463afbdc
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/deliver.php
View File

@ -2,6 +2,7 @@
require_once('include/cli_startup.php'); require_once('include/cli_startup.php');
require_once('include/zot.php'); require_once('include/zot.php');
require_once('include/queue_fn.php');
function deliver_run($argv, $argc) { function deliver_run($argv, $argc) {
@ -90,17 +91,11 @@ function deliver_run($argv, $argc) {
dbesc($argv[$x]) dbesc($argv[$x])
); );
$y = q("delete from outq where outq_hash = '%s'", remove_queue_item($argv[$x]);
dbesc($argv[$x])
);
} }
else { else {
logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $r[0]['outq_posturl'],LOGGER_DEBUG); logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $r[0]['outq_posturl'],LOGGER_DEBUG);
$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'", update_queue_item($argv[$x]);
dbesc(datetime_convert()),
dbesc($argv[$x])
);
} }
continue; continue;
} }
@ -127,9 +122,9 @@ function deliver_run($argv, $argc) {
$msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m))))); $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m)))));
$dresult = zot_import($msg,z_root()); $dresult = zot_import($msg,z_root());
} }
$r = q("delete from outq where outq_hash = '%s'",
dbesc($argv[$x]) remove_queue_item($argv[$x]);
);
if($dresult && is_array($dresult)) { if($dresult && is_array($dresult)) {
foreach($dresult as $xx) { foreach($dresult as $xx) {
if(is_array($xx) && array_key_exists('message_id',$xx)) { if(is_array($xx) && array_key_exists('message_id',$xx)) {
@ -162,10 +157,7 @@ function deliver_run($argv, $argc) {
else { else {
logger('deliver: remote zot delivery failed to ' . $r[0]['outq_posturl']); logger('deliver: remote zot delivery failed to ' . $r[0]['outq_posturl']);
logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA); logger('deliver: remote zot delivery fail data: ' . print_r($result,true), LOGGER_DATA);
$y = q("update outq set outq_updated = '%s' where outq_hash = '%s'", update_queue_item($argv[$x],10);
dbesc(datetime_convert()),
dbesc($argv[$x])
);
} }
} }
} }