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

queue cleanup, and report issues

Browse Source
This commit is contained in:
redmatrix 2015-09-29 22:11:10 -07:00
parent 928fa44154
commit cca9f2392e
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/deliver.php
View File

@ -29,6 +29,8 @@ function deliver_run($argv, $argc) {
* If not, reduce the outq_priority. * If not, reduce the outq_priority.
*/ */
$base = '';
$h = parse_url($r[0]['outq_posturl']); $h = parse_url($r[0]['outq_posturl']);
if($h) { if($h) {
$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : ''); $base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
@ -76,10 +78,12 @@ function deliver_run($argv, $argc) {
$result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']); $result = z_post_url($r[0]['outq_posturl'],$r[0]['outq_msg']);
if($result['success'] && $result['return_code'] < 300) { if($result['success'] && $result['return_code'] < 300) {
logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG); logger('deliver: queue post success to ' . $r[0]['outq_posturl'], LOGGER_DEBUG);
if($base) {
q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ", q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($site_url) dbesc($base)
); );
}
q("update dreport set status = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1", q("update dreport set status = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
dbesc('accepted for delivery'), dbesc('accepted for delivery'),
dbesc(datetime_convert()), dbesc(datetime_convert()),

25
include/queue.php
View File

@ -23,6 +23,9 @@ function queue_run($argv, $argc){
logger('queue: start'); logger('queue: start');
// delete all queue items more than 3 days old
// but first mark these sites dead if we haven't heard from them in a month
$r = q("select outq_posturl from outq where outq_created < %s - INTERVAL %s", $r = q("select outq_posturl from outq where outq_created < %s - INTERVAL %s",
db_utcnow(), db_quoteinterval('3 DAY') db_utcnow(), db_quoteinterval('3 DAY')
); );
@ -85,15 +88,34 @@ function queue_run($argv, $argc){
return; return;
foreach($r as $rr) { foreach($r as $rr) {
$dresult = null;
if(in_array($rr['outq_posturl'],$deadguys)) if(in_array($rr['outq_posturl'],$deadguys))
continue; continue;
$base = '';
$h = parse_url($rr['outq_posturl']);
if($h)
$base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : '');
if($rr['outq_driver'] === 'post') { if($rr['outq_driver'] === 'post') {
$result = z_post_url($rr['outq_posturl'],$rr['outq_msg']); $result = z_post_url($rr['outq_posturl'],$rr['outq_msg']);
if($result['success'] && $result['return_code'] < 300) { if($result['success'] && $result['return_code'] < 300) {
logger('queue: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG); logger('queue: queue post success to ' . $rr['outq_posturl'], LOGGER_DEBUG);
if($base) {
q("update site set site_update = '%s', site_dead = 0 where site_url = '%s' ",
dbesc(datetime_convert()),
dbesc($base)
);
}
q("update dreport set status = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1",
dbesc('accepted for delivery'),
dbesc(datetime_convert()),
dbesc($rr['outq_hash'])
);
$y = q("delete from outq where outq_hash = '%s'", $y = q("delete from outq where outq_hash = '%s'",
dbesc($rr['ouq_hash']) dbesc($rr['outq_hash'])
); );
} }
else { else {
@ -102,6 +124,7 @@ function queue_run($argv, $argc){
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($rr['outq_hash']) dbesc($rr['outq_hash'])
); );
$deadguys[] = $rr['outq_posturl'];
} }
continue; continue;
} }