X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=f7dcce1642800ba74730f6b05f0f19a805f2b562;hb=ef0e34adf32b8a6e7dbe70d47a2640fd74094899;hp=185e0671a0868fad448c33ec6ec675cc40ed22be;hpb=e1216e3a6079d20f0e525193f500ae2141a29ffd;p=friendica.git

diff --git a/bin/daemon.php b/bin/daemon.php
index 185e0671a0..f7dcce1642 100755
--- 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,26 +96,38 @@ 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
+	}
 
-register_shutdown_function('shutdown');
+	fclose(STDIN);  // Close all of the standard
+	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');
+
+	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);
@@ -121,24 +135,44 @@ 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('Forcing cron worker call.', LOGGER_DEBUG);
+		$do_cron = true;
+	}
+
 	Worker::spawnWorker($do_cron);
 
+	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("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 {