X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=e2bad90df59775e74ad4cd96164a84d6df41d13c;hb=c7bbe08a48af9873ec315dc100ed73d4268d44ed;hp=acb26d8199bb68e94d2d5b4442caee6c170d7cdc;hpb=97e95473a1f4d748e9f61f4d430a68bfedeae222;p=friendica.git

diff --git a/bin/daemon.php b/bin/daemon.php
index acb26d8199..e2bad90df5 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -8,18 +8,23 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 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);
 }
@@ -28,18 +33,21 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
-require_once ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
+if (App\Mode::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('Please set system.pidfile in config/local.ini.php. For example:'."\n".
+		'[system]'."\n".
+		'pidfile = /path/to/daemon.pid'."\n");
 }
 
+$pidfile = Config::get('system', 'pidfile');
+
 if (in_array("start", $_SERVER["argv"])) {
 	$mode = "start";
 }
@@ -52,6 +60,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 +70,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);
@@ -94,41 +108,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
 
-register_shutdown_function('shutdown');
+	// 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.
 
-if (posix_setsid() < 0) {
-	return;
-}
+	DBA::disconnect();
 
-if ($pid = pcntl_fork()) {
-	return;     // Parent
-}
+	register_shutdown_function('shutdown');
 
-// 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);
+	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
+	$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;
@@ -146,18 +164,27 @@ while (true) {
 	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();
+		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 {