X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fdaemon.php;h=f0154e74e8dcef2242d05bd16b3619fd30f987fb;hb=cdbc94a9e1b27f8843e3c423b46701338bebbf7a;hp=7e71571cb3be3cf5fd94ac28d05e861fcdbe6a6b;hpb=1e0e1674f2aeef54c52790946cfd61a199cb2042;p=friendica.git

diff --git a/bin/daemon.php b/bin/daemon.php
index 7e71571cb3..f0154e74e8 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -7,12 +7,13 @@
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
 
-use Friendica\App;
+use Dice\Dice;
 use Friendica\Core\Config;
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Factory;
-use Friendica\Util\BasePath;
+use Friendica\DI;
+use Psr\Log\LoggerInterface;
 
 // Get options
 $shortopts = 'f';
@@ -33,14 +34,13 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$basedir = BasePath::create(dirname(__DIR__));
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
-$logger = Factory\LoggerFactory::create('daemon', $config);
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
 
-$a = new App($config, $logger);
+DI::init($dice);
+$a = DI::app();
 
-if ($a->getMode()->isInstall()) {
+if (DI::mode()->isInstall()) {
 	die("Friendica isn't properly installed yet.\n");
 }
 
@@ -108,7 +108,7 @@ if ($mode == "stop") {
 
 	unlink($pidfile);
 
-	$logger->notice("Worker daemon process was killed", ["pid" => $pid]);
+	Logger::notice("Worker daemon process was killed", ["pid" => $pid]);
 
 	Config::set('system', 'worker_daemon_mode', false);
 	die("Worker daemon process $pid was killed.\n");
@@ -118,7 +118,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";
@@ -150,7 +150,7 @@ if (!$foreground) {
 	file_put_contents($pidfile, $pid);
 
 	// We lose the database connection upon forking
-	$a->loadDatabase();
+	DBA::reconnect();
 }
 
 Config::set('system', 'worker_daemon_mode', true);
@@ -166,7 +166,7 @@ $last_cron = 0;
 // Now running as a daemon.
 while (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;
 	}
 
@@ -180,7 +180,7 @@ while (true) {
 		$last_cron = time();
 	}
 
-	$logger->info("Sleeping", ["pid" => $pid]);
+	Logger::info("Sleeping", ["pid" => $pid]);
 	$start = time();
 	do {
 		$seconds = (time() - $start);
@@ -197,10 +197,10 @@ while (true) {
 
 	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]);
 	}
 }