sforkowany z mirror/friendica
Merge remote-tracking branch 'upstream/develop' into diasppora-delivery
commit
dc4a2aeab8
|
@ -668,9 +668,10 @@ class Worker
|
|||
DBA::close($processes);
|
||||
|
||||
// Now adding all processes with workerqueue entries
|
||||
$entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
|
||||
$entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow());
|
||||
while ($entry = DBA::fetch($entries)) {
|
||||
$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]);
|
||||
$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `next_try` < ? AND `priority` = ?",
|
||||
DateTimeFormat::utcNow(), $entry["priority"]);
|
||||
if ($process = DBA::fetch($processes)) {
|
||||
$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ class ActivityPub
|
|||
public static function fetchContent($url, $uid = 0)
|
||||
{
|
||||
if (!empty($uid)) {
|
||||
return HTTPSignature::fetch($url, 1);
|
||||
return HTTPSignature::fetch($url, $uid);
|
||||
}
|
||||
|
||||
$curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
|
||||
|
|
|
@ -240,7 +240,7 @@ class Receiver
|
|||
}
|
||||
|
||||
/**
|
||||
* Fetches the first uider id from the receiver array
|
||||
* Fetches the first user id from the receiver array
|
||||
*
|
||||
* @param array $receivers Array with receivers
|
||||
* @return integer user id;
|
||||
|
|
Ładowanie…
Reference in New Issue