From 1bfcd0ac6e0c5d6f8a9d942f14590dc7da9b2f63 Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 28 Dec 2024 23:00:23 +0000 Subject: [PATCH] refactor App::processJetstream --- src/App.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/App.php b/src/App.php index f16c2f89fd..472a1cd773 100644 --- a/src/App.php +++ b/src/App.php @@ -450,13 +450,20 @@ class App Addon::loadAddons(); Hook::loadHooks(); - DI::config()->reload(); - if (DI::mode()->isInstall()) { + /** @var IManageConfigValues */ + $config = $this->container->create(IManageConfigValues::class); + + $config->reload(); + + /** @var Mode */ + $mode = $this->container->create(Mode::class); + + if ($mode->isInstall()) { die("Friendica isn't properly installed yet.\n"); } - if (empty(DI::config()->get('jetstream', 'pidfile'))) { + if (empty($config->get('jetstream', 'pidfile'))) { die(<<get('jetstream', 'pidfile'); + $pidfile = $config->get('jetstream', 'pidfile'); if (in_array('start', (array)$_SERVER['argv'])) { $mode = 'start';