TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

more queue updates from streams and remove a hz_syslog

Browse Source
This commit is contained in:
Mario
2023-02-16 11:16:44 +00:00
parent 321cd9f2e0
commit cbf8c4bdb2
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Daemon/Queue.php
View File

@@ -54,7 +54,7 @@ class Queue {
foreach ($qItems as $qItem) {
$deliveries[] = $qItem['outq_hash'];
}
do_delivery($deliveries);
do_delivery($deliveries, true);
}
}
}

4
Zotlabs/Lib/Libsync.php
View File

@@ -998,12 +998,12 @@ class Libsync {
}
}
// get rid of any hubs we have for this channel which weren't reported.
// get rid of any hublocs we have for this channel which weren't reported.
if ($xisting) {
foreach ($xisting as $x) {
if (!array_key_exists('updated', $x)) {
hz_syslog('Deleting unreferenced hub location ' . $x['hubloc_addr']);
logger('Deleting unreferenced hub location ' . $x['hubloc_addr']);
q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id_url = '%s'",
dbesc(datetime_convert()),
dbesc($x['hubloc_id_url'])

23
Zotlabs/Lib/Queue.php
View File

@@ -166,17 +166,18 @@ class Queue {
$y = q("select site_update, site_dead from site where site_url = '%s' ",
dbesc($base)
);
if($y) {
if(intval($y[0]['site_dead'])) {
self::remove_by_posturl($outq['outq_posturl']);
logger('dead site ignored ' . $base);
return;
}
if($y[0]['site_update'] < datetime_convert('UTC','UTC','now - 1 month')) {
self::update($outq['outq_hash'], 10);
logger('immediate delivery deferred for site ' . $base);
return;
}
// Don't bother delivering if the site is dead.
// And if we haven't heard from the site in over a month - let them through but 3 strikes you're out.
if ($y && (intval($y[0]['site_dead']) || ($y[0]['site_update'] < datetime_convert('UTC', 'UTC', 'now - 1 month') && $outq['outq_priority'] > 20 ))) {
q("update dreport set dreport_result = '%s' where dreport_queue = '%s'",
dbesc('site dead'),
dbesc($outq['outq_hash'])
);
self::remove_by_posturl($outq['outq_posturl']);
logger('dead site ignored ' . $base);
return;
}
else {