nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into diasppora-delivery

Browse source
This commit is contained in:
Michael 2018-11-04 23:19:34 +00:00
commit dc4a2aeab8
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Core/Worker.php
View file

@ -668,9 +668,10 @@ class Worker
DBA::close($processes); DBA::close($processes);
// Now adding all processes with workerqueue entries // 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)) { 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)) { if ($process = DBA::fetch($processes)) {
$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
} }

2
src/Protocol/ActivityPub.php
View file

@ -67,7 +67,7 @@ class ActivityPub
public static function fetchContent($url, $uid = 0) public static function fetchContent($url, $uid = 0)
{ {
if (!empty($uid)) { 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']); $curlResult = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -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 * @param array $receivers Array with receivers
* @return integer user id; * @return integer user id;