X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=e550aea891ed157adad7b585019598a68dab80b5;hb=73a9db84ee0850d8ec13adda8c4c98e2fd010865;hp=4fa9f8bd3fb5e844f3810a6a9657d5ca88954333;hpb=befc2af5043a3afde251721c0d27df695db1bb7e;p=friendica.git

diff --git a/bin/daemon.php b/bin/daemon.php
index 4fa9f8bd3f..e550aea891 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -18,19 +18,22 @@
  * 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');
+	header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
 	exit();
 }
 
 use Dice\Dice;
 use Friendica\App\Mode;
 use Friendica\Core\Logger;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -43,13 +46,13 @@ $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 (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) {
+	$directory = dirname($_SERVER['argv'][0]);
 
-	if (substr($directory, 0, 1) != "/") {
-		$directory = $_SERVER["PWD"] . "/" . $directory;
+	if (substr($directory, 0, 1) != '/') {
+		$directory = $_SERVER['PWD'] . '/' . $directory;
 	}
-	$directory = realpath($directory . "/..");
+	$directory = realpath($directory . '/..');
 
 	chdir($directory);
 }
@@ -60,7 +63,7 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
 
 DI::init($dice);
-$a = DI::app();
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 
 if (DI::mode()->isInstall()) {
 	die("Friendica isn't properly installed yet.\n");
@@ -68,13 +71,13 @@ if (DI::mode()->isInstall()) {
 
 DI::mode()->setExecutor(Mode::DAEMON);
 
-DI::config()->load();
+DI::config()->reload();
 
 if (empty(DI::config()->get('system', 'pidfile'))) {
 	die(<<<TXT
 Please set system.pidfile in config/local.config.php. For example:
-    
-    'system' => [ 
+
+    'system' => [
         'pidfile' => '/path/to/daemon.pid',
     ],
 TXT
@@ -83,16 +86,16 @@ TXT
 
 $pidfile = DI::config()->get('system', 'pidfile');
 
-if (in_array("start", $_SERVER["argv"])) {
-	$mode = "start";
+if (in_array('start', $_SERVER['argv'])) {
+	$mode = 'start';
 }
 
-if (in_array("stop", $_SERVER["argv"])) {
-	$mode = "stop";
+if (in_array('stop', $_SERVER['argv'])) {
+	$mode = 'stop';
 }
 
-if (in_array("status", $_SERVER["argv"])) {
-	$mode = "status";
+if (in_array('status', $_SERVER['argv'])) {
+	$mode = 'status';
 }
 
 $foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options);
@@ -101,7 +104,7 @@ if (!isset($mode)) {
 	die("Please use either 'start', 'stop' or 'status'.\n");
 }
 
-if (empty($_SERVER["argv"][0])) {
+if (empty($_SERVER['argv'][0])) {
 	die("Unexpected script behaviour. This message should never occur.\n");
 }
 
@@ -111,30 +114,30 @@ if (is_readable($pidfile)) {
 	$pid = intval(file_get_contents($pidfile));
 }
 
-if (empty($pid) && in_array($mode, ["stop", "status"])) {
-	DI::config()->set('system', 'worker_daemon_mode', false);
+if (empty($pid) && in_array($mode, ['stop', 'status'])) {
+	DI::keyValue()->set('worker_daemon_mode', false);
 	die("Pidfile wasn't found. Is the daemon running?\n");
 }
 
-if ($mode == "status") {
+if ($mode == 'status') {
 	if (posix_kill($pid, 0)) {
 		die("Daemon process $pid is running.\n");
 	}
 
 	unlink($pidfile);
 
-	DI::config()->set('system', 'worker_daemon_mode', false);
+	DI::keyValue()->set('worker_daemon_mode', false);
 	die("Daemon process $pid isn't running.\n");
 }
 
-if ($mode == "stop") {
+if ($mode == 'stop') {
 	posix_kill($pid, SIGTERM);
 
 	unlink($pidfile);
 
-	Logger::notice("Worker daemon process was killed", ["pid" => $pid]);
+	Logger::notice('Worker daemon process was killed', ['pid' => $pid]);
 
-	DI::config()->set('system', 'worker_daemon_mode', false);
+	DI::keyValue()->set('worker_daemon_mode', false);
 	die("Worker daemon process $pid was killed.\n");
 }
 
@@ -142,7 +145,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
 	die("Daemon process $pid is already running.\n");
 }
 
-Logger::notice('Starting worker daemon.', ["pid" => $pid]);
+Logger::notice('Starting worker daemon.', ['pid' => $pid]);
 
 if (!$foreground) {
 	echo "Starting worker daemon.\n";
@@ -178,7 +181,7 @@ if (!$foreground) {
 	DBA::connect();
 }
 
-DI::config()->set('system', 'worker_daemon_mode', true);
+DI::keyValue()->set('worker_daemon_mode', true);
 
 // Just to be sure that this script really runs endlessly
 set_time_limit(0);
@@ -190,12 +193,15 @@ $last_cron = 0;
 
 // Now running as a daemon.
 while (true) {
+	// Check the database structure and possibly fixes it
+	Update::check(DI::basePath(), true);
+
 	if (!$do_cron && ($last_cron + $wait_interval) < time()) {
-		Logger::info('Forcing cron worker call.', ["pid" => $pid]);
+		Logger::info('Forcing cron worker call.', ['pid' => $pid]);
 		$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]);
@@ -211,7 +217,7 @@ while (true) {
 	}
 
 	$start = time();
-	Logger::info("Sleeping", ["pid" => $pid, 'until' => gmdate(DateTimeFormat::MYSQL, $start + $wait_interval)]);
+	Logger::info('Sleeping', ['pid' => $pid, 'until' => gmdate(DateTimeFormat::MYSQL, $start + $wait_interval)]);
 
 	do {
 		$seconds = (time() - $start);
@@ -229,17 +235,18 @@ while (true) {
 		}
 
 		$timeout = ($seconds >= $wait_interval);
-	} while (!$timeout && !Worker::IPCJobsExists());
+	} while (!$timeout && !Worker\IPC::JobsExists());
 
 	if ($timeout) {
 		$do_cron = true;
-		Logger::info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
+		Logger::info('Woke up after $wait_interval seconds.', ['pid' => $pid, 'sleep' => $wait_interval]);
 	} else {
 		$do_cron = false;
-		Logger::info("Worker jobs are calling to be forked.", ["pid" => $pid]);
+		Logger::info('Worker jobs are calling to be forked.', ['pid' => $pid]);
 	}
 }
 
 function shutdown() {
+	posix_kill(posix_getpid(), SIGTERM);
 	posix_kill(posix_getpid(), SIGHUP);
 }