clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved workerqueue handling

This commit is contained in:
Michael 2022-07-21 08:55:45 +00:00
parent 3966bff8a1
commit 99f7270e18
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Protocol/ActivityPub/Processor.php
View File

@ -281,6 +281,11 @@ class Processor
} }
if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) { if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Post::exists(['uri' => $activity['reply-to-id']])) {
if (Queue::hasWorker($activity)) {
Logger::notice('There is already a worker task to dfetch the post.', ['parent' => $activity['reply-to-id']]);
return [];
}
$recursion_depth = $activity['recursion-depth'] ?? 0; $recursion_depth = $activity['recursion-depth'] ?? 0;
Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]); Logger::notice('Parent not found. Try to refetch it.', ['parent' => $activity['reply-to-id'], 'recursion-depth' => $recursion_depth]);
if ($recursion_depth < 10) { if ($recursion_depth < 10) {

17
src/Protocol/ActivityPub/Queue.php
View File

@ -104,6 +104,20 @@ class Queue
DBA::update('inbox-entry', ['wid' => $wid], ['id' => $activity['entry-id']]); DBA::update('inbox-entry', ['wid' => $wid], ['id' => $activity['entry-id']]);
} }
/**
* Check if there is an assigned worker task
*
* @param array $activity
* @return bool
*/
public static function hasWorker(array $activity = []): bool
{
if (empty($activity['worker-id'])) {
return false;
}
return DBA::exists('workerqueue', ['id' => $activity['worker-id'], 'done' => false]);
}
/** /**
* Process the activity with the given id * Process the activity with the given id
* *
@ -124,6 +138,7 @@ class Queue
$push = $entry['push']; $push = $entry['push'];
$activity['entry-id'] = $entry['id']; $activity['entry-id'] = $entry['id'];
$activity['worker-id'] = $entry['wid'];
if (!Receiver::routeActivities($activity, $type, $push)) { if (!Receiver::routeActivities($activity, $type, $push)) {
self::remove($activity); self::remove($activity);
@ -150,7 +165,7 @@ class Queue
*/ */
public static function clear() public static function clear()
{ {
DBA::delete('inbox-entry', ["`received` < ?", DateTimeFormat::utc('now - 2 days')]); DBA::delete('inbox-entry', ["`wid` IS NULL AND `received` < ?", DateTimeFormat::utc('now - 4 hours')]);
} }
/** /**