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

Merge pull request #5363 from annando/daemin

Browse Source 
Workaround for stalling worker processes when running the daemon
This commit is contained in:
Tobias Diekershoff
2018-07-11 08:26:09 +02:00
committed by GitHub
parent 8825728fa4 3cb7a7606e
commit 26723623f4
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Core/Worker.php
+1 -1
View File
@@ -597,7 +597,7 @@ class Worker
['id' => $entry["id"]]
);
} else {
logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
}
}
}
src/Model/GContact.php
+5 -4
View File
@@ -564,15 +564,16 @@ class GContact
if (strlen(Config::get('system', 'directory'))) {
$x = Network::fetchUrl(get_server()."/pubsites");
if ($x) {
if (!empty($x)) {
$j = json_decode($x);
if ($j->entries) {
if (!empty($j->entries)) {
foreach ($j->entries as $entry) {
PortableContact::checkServer($entry->url);
$url = $entry->url . '/poco';
if (! in_array($url, $done)) {
PortableContact::loadWorker(0, 0, 0, $entry->url . '/poco');
if (!in_array($url, $done)) {
PortableContact::loadWorker(0, 0, 0, $url);
$done[] = $url;
}
}
}