X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=e60e32b19ec0900caf57450c0d7c09794d69d2d3;hb=5cb56a6b120a1aed376dda79252c218679ca6b2c;hp=185e0671a0868fad448c33ec6ec675cc40ed22be;hpb=e1216e3a6079d20f0e525193f500ae2141a29ffd;p=friendica.git diff --git a/bin/daemon.php b/bin/daemon.php index 185e0671a0..e60e32b19e 100755 --- a/bin/daemon.php +++ b/bin/daemon.php @@ -8,38 +8,51 @@ */ use Friendica\App; -use Friendica\BaseObject; use Friendica\Core\Config; +use Friendica\Core\Logger; use Friendica\Core\Worker; +use Friendica\Database\DBA; + +// Get options +$shortopts = 'f'; +$longopts = ['foreground']; +$options = getopt($shortopts, $longopts); // Ensure that daemon.php is executed from the base path of the installation if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); if (substr($directory, 0, 1) != "/") { - $directory = $_SERVER["PWD"]."/".$directory; + $directory = $_SERVER["PWD"] . "/" . $directory; } - $directory = realpath($directory."/.."); + $directory = realpath($directory . "/.."); chdir($directory); } -require_once "boot.php"; -require_once "include/dba.php"; +require dirname(__DIR__) . '/vendor/autoload.php'; $a = new App(dirname(__DIR__)); -BaseObject::setApp($a); -require_once ".htconfig.php"; -dba::connect($db_host, $db_user, $db_pass, $db_data); +if ($a->getMode()->isInstall()) { + die("Friendica isn't properly installed yet.\n"); +} Config::load(); -if (!isset($pidfile)) { - die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n". - '$pidfile = "/path/to/daemon.pid";'."\n"); +if (empty(Config::get('system', 'pidfile'))) { + die(<< [ + 'pidfile' => '/path/to/daemon.pid', + ], +TXT + ); } +$pidfile = Config::get('system', 'pidfile'); + if (in_array("start", $_SERVER["argv"])) { $mode = "start"; } @@ -52,6 +65,8 @@ if (in_array("status", $_SERVER["argv"])) { $mode = "status"; } +$foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options); + if (!isset($mode)) { die("Please use either 'start', 'stop' or 'status'.\n"); } @@ -60,7 +75,11 @@ if (empty($_SERVER["argv"][0])) { die("Unexpected script behaviour. This message should never occur.\n"); } -$pid = @file_get_contents($pidfile); +$pid = null; + +if (is_readable($pidfile)) { + $pid = intval(file_get_contents($pidfile)); +} if (empty($pid) && in_array($mode, ["stop", "status"])) { Config::set('system', 'worker_daemon_mode', false); @@ -83,7 +102,7 @@ if ($mode == "stop") { unlink($pidfile); - logger("Worker daemon process $pid was killed.", LOGGER_DEBUG); + Logger::log("Worker daemon process $pid was killed.", Logger::DEBUG); Config::set('system', 'worker_daemon_mode', false); die("Worker daemon process $pid was killed.\n"); @@ -93,57 +112,89 @@ if (!empty($pid) && posix_kill($pid, 0)) { die("Daemon process $pid is already running.\n"); } -logger('Starting worker daemon.', LOGGER_DEBUG); -echo "Starting worker daemon.\n"; +Logger::log('Starting worker daemon.', Logger::DEBUG); -// 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 + } + + 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. -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 + } -// 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); + $pid = getmypid(); + file_put_contents($pidfile, $pid); + + // We lose the database connection upon forking + $a->loadDatabase(); +} 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; +$last_cron = 0; // Now running as a daemon. while (true) { + if (!$do_cron && ($last_cron + $wait_interval) < time()) { + Logger::log('Forcing cron worker call.', Logger::DEBUG); + $do_cron = true; + } + Worker::spawnWorker($do_cron); - logger("Sleeping", LOGGER_DEBUG); - $i = 0; + if ($do_cron) { + // We force a reconnect of the database connection. + // This is done to ensure that the connection don't get lost over time. + DBA::reconnect(); + + $last_cron = time(); + } + + Logger::log("Sleeping", Logger::DEBUG); + $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); + Logger::log("Woke up after $wait_interval seconds.", Logger::DEBUG); } else { $do_cron = false; - logger("Worker jobs are calling to be forked.", LOGGER_DEBUG); + Logger::log("Worker jobs are calling to be forked.", Logger::DEBUG); } }