From e2ac36e43e554b65f174063b80dc704ddde83f76 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Oct 2018 22:25:53 -0400 Subject: [PATCH] Simplify bin/worker - Remove duplicate calls to Addon::loadHooks and Config::load - Remove useless killme() call --- bin/worker.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/bin/worker.php b/bin/worker.php index cb09a4929d..3d2fc3fa9f 100755 --- a/bin/worker.php +++ b/bin/worker.php @@ -4,9 +4,7 @@ * @file bin/worker.php * @brief Starts the background processing */ - use Friendica\App; -use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\Worker; use Friendica\Core\L10n; @@ -20,10 +18,10 @@ $options = getopt($shortopts, $longopts); if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); - if (substr($directory, 0, 1) != "/") { - $directory = $_SERVER["PWD"]."/".$directory; + if (substr($directory, 0, 1) != '/') { + $directory = $_SERVER["PWD"] . '/' . $directory; } - $directory = realpath($directory."/.."); + $directory = realpath($directory . '/..'); chdir($directory); } @@ -32,8 +30,6 @@ require_once "boot.php"; $a = new App(dirname(__DIR__)); -Config::load(); - $lang = L10n::getBrowserLanguage(); L10n::loadTranslationTable($lang); @@ -41,14 +37,12 @@ L10n::loadTranslationTable($lang); check_db(true); // Quit when in maintenance -if (Config::get('system', 'maintenance', false, true)) { +if (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED)) { return; } $a->setBaseURL(Config::get('system', 'url')); -Addon::loadHooks(); - $spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options); if ($spawn) { @@ -63,5 +57,3 @@ Worker::processQueue($run_cron); Worker::unclaimProcess(); Worker::endProcess(); - -killme();