Fix optical glitch: Replace multiple newlines when replacing attachments

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index 9051e0e6c3be227c55b407ce3260414c24bca851..948829c1bf8ae02815af420267ce3c1f3f02e7d3 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -7,11 +7,12 @@
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
 
+use Dice\Dice;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Factory;
+use Psr\Log\LoggerInterface;
 
 // Get options
 $shortopts = 'f';
@@ -32,7 +33,11 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('daemon', dirname(__DIR__));
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
+
+\Friendica\BaseObject::setDependencyInjection($dice);
+$a = \Friendica\BaseObject::getApp();
 
 if ($a->getMode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
@@ -144,7 +149,7 @@ if (!$foreground) {
        file_put_contents($pidfile, $pid);
 
        // We lose the database connection upon forking
-       $a->getDatabase()->reconnect();
+       DBA::reconnect();
 }
 
 Config::set('system', 'worker_daemon_mode', true);