Convert to tabs

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index d08aa37d15906fab61ceaf63a67707f26b0d0c24..1682d366ede0ca16fd05c3ab8f0df7bd04b13a0a 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,17 +18,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
+ */
+
+/**
  * Run the worker from a daemon.
  *
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
-
 if (php_sapi_name() !== 'cli') {
        header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
        exit();
 }
 
 use Dice\Dice;
+use Friendica\App\Mode;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -59,12 +62,15 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
 
 DI::init($dice);
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 $a = DI::app();
 
 if (DI::mode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
 }
 
+DI::mode()->setExecutor(Mode::DAEMON);
+
 DI::config()->load();
 
 if (empty(DI::config()->get('system', 'pidfile'))) {
@@ -144,34 +150,35 @@ Logger::notice('Starting worker daemon.', ["pid" => $pid]);
 if (!$foreground) {
        echo "Starting worker daemon.\n";
 
-       // Switch over to daemon mode.
-       if ($pid = pcntl_fork()) {
-               return;     // Parent
-       }
-
-       fclose(STDIN);  // Close all of the standard
-
-       // 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();
 
+       // Fork a daemon process
+       $pid = pcntl_fork();
+       if ($pid == -1) {
+               echo "Daemon couldn't be forked.\n";
+               Logger::warning('Could not fork daemon');
+               exit(1);
+       } elseif ($pid) {
+               // The parent process continues here
+               echo 'Child process started with pid ' . $pid . ".\n";
+               Logger::notice('Child process started', ['pid' => $pid]);
+               file_put_contents($pidfile, $pid);
+               exit(0);
+       }
+
+       // We now are in the child process
        register_shutdown_function('shutdown');
 
+       // Make the child the main process, detach it from the terminal
        if (posix_setsid() < 0) {
                return;
        }
 
-       if ($pid = pcntl_fork()) {
-               return;     // Parent
-       }
-
-       $pid = getmypid();
-       file_put_contents($pidfile, $pid);
+       // Closing all existing connections with the outside
+       fclose(STDIN);
 
-       // We lose the database connection upon forking
-       DBA::reconnect();
+       // And now connect the database again
+       DBA::connect();
 }
 
 DI::config()->set('system', 'worker_daemon_mode', true);
@@ -191,7 +198,7 @@ while (true) {
                $do_cron = true;
        }
 
-       if ($do_cron || (!DI::process()->isMaxLoadReached() && Worker::entriesExists() && Worker::isReady())) {
+       if ($do_cron || (!DI::system()->isMaxLoadReached() && Worker::entriesExists() && Worker::isReady())) {
                Worker::spawnWorker($do_cron);
        } else {
                Logger::info('Cool down for 5 seconds', ['pid' => $pid]);
@@ -219,8 +226,13 @@ while (true) {
                $sleep = min(1000000, round(log10($arg) * 1000000, 0));
                usleep($sleep);
 
+               $pid = pcntl_waitpid(-1, $status, WNOHANG);
+               if ($pid > 0) {
+                       Logger::info('Children quit via pcntl_waitpid', ['pid' => $pid, 'status' => $status]);
+               }
+
                $timeout = ($seconds >= $wait_interval);
-       } while (!$timeout && !Worker::IPCJobsExists());
+       } while (!$timeout && !Worker\IPC::JobsExists());
 
        if ($timeout) {
                $do_cron = true;