Config FollowUp

[friendica.git] / bin / daemon.php

diff --git a/bin/daemon.php b/bin/daemon.php
index da4bc1992595e87233fb0d4fc0f6f935c3fc372f..2b106b62d8cffb72a3db03eeb9c588ccd8235776 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -9,6 +9,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Factory;
@@ -34,8 +35,11 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
+$configLoader = new Cache\ConfigCacheLoader($basedir);
+$configCache = Factory\ConfigFactory::createCache($configLoader);
+Factory\DBFactory::init($configCache, $_SERVER);
+$config = Factory\ConfigFactory::createConfig($configCache);
+$pconfig = Factory\ConfigFactory::createPConfig($configCache);
 $logger = Factory\LoggerFactory::create('daemon', $config);
 $profiler = Factory\ProfilerFactory::create($logger, $config);
 
@@ -151,7 +155,7 @@ if (!$foreground) {
        file_put_contents($pidfile, $pid);
 
        // We lose the database connection upon forking
-       $a->loadDatabase();
+       Factory\DBFactory::init($configCache, $_SERVER);
 }
 
 Config::set('system', 'worker_daemon_mode', true);