regen master messages.po

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index b8c8d2e342007be21958c171bc92e43e99c81ff3..f7dcce1642800ba74730f6b05f0f19a805f2b562 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -52,6 +52,8 @@ if (in_array("status", $_SERVER["argv"])) {
        $mode = "status";
 }
 
+$foreground = in_array("--foreground", $_SERVER["argv"]);
+
 if (!isset($mode)) {
        die("Please use either 'start', 'stop' or 'status'.\n");
 }
@@ -94,40 +96,45 @@ if (!empty($pid) && posix_kill($pid, 0)) {
 }
 
 logger('Starting worker daemon.', LOGGER_DEBUG);
-echo "Starting worker daemon.\n";
 
-// Switch over to daemon mode.
-if ($pid = pcntl_fork()) {
-       return;     // Parent
-}
+if (!$foreground) {
+       echo "Starting worker daemon.\n";
 
-fclose(STDIN);  // Close all of the standard
-fclose(STDOUT); // file descriptors as we
-fclose(STDERR); // are running as a daemon.
+       // Switch over to daemon mode.
+       if ($pid = pcntl_fork()) {
+               return;     // Parent
+       }
 
-dba::disconnect();
+       fclose(STDIN);  // Close all of the standard
+       fclose(STDOUT); // file descriptors as we
+       fclose(STDERR); // are running as a daemon.
 
-register_shutdown_function('shutdown');
+       dba::disconnect();
 
-if (posix_setsid() < 0) {
-       return;
-}
+       register_shutdown_function('shutdown');
 
-if ($pid = pcntl_fork()) {
-       return;     // Parent
+       if (posix_setsid() < 0) {
+               return;
+       }
+
+       if ($pid = pcntl_fork()) {
+               return;     // Parent
+       }
+
+       $pid = getmypid();
+       file_put_contents($pidfile, $pid);
+
+       // We lose the database connection upon forking
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
 }
 
-// We lose the database connection upon forking
-dba::connect($db_host, $db_user, $db_pass, $db_data);
+unset($db_host, $db_user, $db_pass, $db_data);
 
 Config::set('system', 'worker_daemon_mode', true);
 
 // Just to be sure that this script really runs endlessly
 set_time_limit(0);
 
-$pid = getmypid();
-file_put_contents($pidfile, $pid);
-
 $wait_interval = intval(Config::get('system', 'cron_interval', 5)) * 60;
 
 $do_cron = true;
@@ -143,21 +150,29 @@ while (true) {
        Worker::spawnWorker($do_cron);
 
        if ($do_cron) {
-               // We force a disconnect and reconnect of the database connection.
+               // We force a reconnect of the database connection.
                // This is done to ensure that the connection don't get lost over time.
-               dba::disconnect();
-               dba::connect($db_host, $db_user, $db_pass, $db_data);
+               dba::reconnect();
 
                $last_cron = time();
        }
 
        logger("Sleeping", LOGGER_DEBUG);
-       $i = 0;
+       $start = time();
        do {
-               sleep(1);
-       } while (($i++ < $wait_interval) && !Worker::IPCJobsExists());
+               $seconds = (time() - $start);
+
+               // logarithmic wait time calculation.
+               // Background: After jobs had been started, they often fork many workers.
+               // To not waste too much time, the sleep period increases.
+               $arg = (($seconds + 1) / ($wait_interval / 9)) + 1;
+               $sleep = round(log10($arg) * 1000000, 0);
+               usleep($sleep);
+
+               $timeout = ($seconds >= $wait_interval);
+       } while (!$timeout && !Worker::IPCJobsExists());
 
-       if ($i >= $wait_interval) {
+       if ($timeout) {
                $do_cron = true;
                logger("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
        } else {