X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=63d28fc80cfa4f8866f5aa232e735dc5f9f4790d;hb=85304b6e8f0055151aef4fe1419eeecf67b20ee7;hp=dd848838873b7439de50e17c84a4493b51386d40;hpb=0e2e488521fbcf2d52dc8037ee6e9dd577fbf14c;p=friendica.git diff --git a/src/App.php b/src/App.php index dd84883887..63d28fc80c 100644 --- a/src/App.php +++ b/src/App.php @@ -21,6 +21,7 @@ namespace Friendica; +use Dice\Dice; use Exception; use Friendica\App\Arguments; use Friendica\App\BaseURL; @@ -118,9 +119,9 @@ class App private $args; /** - * @var Core\Process The process methods + * @var Core\System The system methods */ - private $process; + private $system; /** * @var IManagePersonalConfigValues @@ -327,10 +328,10 @@ class App * @param Profiler $profiler The profiler of this application * @param L10n $l10n The translator instance * @param App\Arguments $args The Friendica Arguments of the call - * @param Core\Process $process The process methods + * @param Core\System $system The system methods * @param IManagePersonalConfigValues $pConfig Personal configuration */ - public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IManagePersonalConfigValues $pConfig) + public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\System $system, IManagePersonalConfigValues $pConfig) { $this->database = $database; $this->config = $config; @@ -340,7 +341,7 @@ class App $this->logger = $logger; $this->l10n = $l10n; $this->args = $args; - $this->process = $process; + $this->system = $system; $this->pConfig = $pConfig; $this->load(); @@ -575,7 +576,7 @@ class App * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ - public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, float $start_time) + public function runFrontend(App\Module $module, App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Dice $dice, float $start_time) { $this->profiler->set($start_time, 'start'); $this->profiler->set(microtime(true), 'classinit'); @@ -588,14 +589,6 @@ class App throw new HTTPException\InternalServerErrorException('Apologies but the website is unavailable at the moment.'); } - // Max Load Average reached: ERROR - if ($this->process->isMaxProcessesReached() || $this->process->isMaxLoadReached()) { - header('Retry-After: 120'); - header('Refresh: 120; url=' . $this->baseURL->get() . "/" . $this->args->getQueryString()); - - throw new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.'); - } - if (!$this->mode->isInstall()) { // Force SSL redirection if ($this->baseURL->checkRedirectHttps()) { @@ -710,11 +703,11 @@ class App $page['page_title'] = $moduleName; if (!$this->mode->isInstall() && !$this->mode->has(App\Mode::MAINTENANCEDISABLED)) { - $module = new Module('maintenance', Maintenance::class); + $module = new Module('maintenance', new Maintenance()); } else { // determine the module class and save it to the module instance // @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet) - $module = $module->determineClass($this->args, $router, $this->config); + $module = $module->determineClass($this->args, $router, $this->config, $dice); } // Let the module run it's internal process (init, get, post, ...)