bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/daemon.php
View file

@ -106,8 +106,10 @@ if (!$foreground) {
} }
fclose(STDIN); // Close all of the standard fclose(STDIN); // Close all of the standard
fclose(STDOUT); // file descriptors as we
fclose(STDERR); // are running as a daemon. // Enabling this seem to block a running php process with 100% CPU usage when there is an outpout
// fclose(STDOUT); // file descriptors as we
// fclose(STDERR); // are running as a daemon.
dba::disconnect(); dba::disconnect();

1
bin/worker.php
View file

@ -63,4 +63,3 @@ Worker::unclaimProcess();
Worker::endProcess(); Worker::endProcess();
killme(); killme();

2
src/Core/Worker.php
View file

@ -597,7 +597,7 @@ class Worker
['id' => $entry["id"]] ['id' => $entry["id"]]
); );
} else { } 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);
} }
} }
} }

9
src/Model/GContact.php
View file

@ -564,15 +564,16 @@ class GContact
if (strlen(Config::get('system', 'directory'))) { if (strlen(Config::get('system', 'directory'))) {
$x = Network::fetchUrl(get_server()."/pubsites"); $x = Network::fetchUrl(get_server()."/pubsites");
if ($x) { if (!empty($x)) {
$j = json_decode($x); $j = json_decode($x);
if ($j->entries) { if (!empty($j->entries)) {
foreach ($j->entries as $entry) { foreach ($j->entries as $entry) {
PortableContact::checkServer($entry->url); PortableContact::checkServer($entry->url);
$url = $entry->url . '/poco'; $url = $entry->url . '/poco';
if (! in_array($url, $done)) { if (!in_array($url, $done)) {
PortableContact::loadWorker(0, 0, 0, $entry->url . '/poco'); PortableContact::loadWorker(0, 0, 0, $url);
$done[] = $url;
} }
} }
} }