Fix redirect logging

[friendica.git] / bin / worker.php

diff --git a/bin/worker.php b/bin/worker.php
index cb09a4929da9fe0c445baca4361445902687531f..5698cf16ddfaca79eb69b0e1aa04d3efa515435c 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -1,15 +1,38 @@
 #!/usr/bin/env php
 <?php
 /**
- * @file bin/worker.php
- * @brief Starts the background processing
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Starts the background processing
  */
 
+if (php_sapi_name() !== 'cli') {
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
+}
+
+use Dice\Dice;
 use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
+use Friendica\Core\Process;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
-use Friendica\Core\L10n;
+use Friendica\DI;
+use Psr\Log\LoggerInterface;
 
 // Get options
 $shortopts = 'sn';
@@ -20,40 +43,37 @@ $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);
 }
 
-require_once "boot.php";
-
-$a = new App(dirname(__DIR__));
+require dirname(__DIR__) . '/vendor/autoload.php';
 
-Config::load();
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
 
-$lang = L10n::getBrowserLanguage();
-L10n::loadTranslationTable($lang);
+DI::init($dice);
+$a = DI::app();
 
 // Check the database structure and possibly fixes it
-check_db(true);
+Update::check($a->getBasePath(), true, DI::mode());
 
 // Quit when in maintenance
-if (Config::get('system', 'maintenance', false, true)) {
+if (!DI::mode()->has(App\Mode::MAINTENANCEDISABLED)) {
        return;
 }
 
-$a->setBaseURL(Config::get('system', 'url'));
-
-Addon::loadHooks();
+DI::baseUrl()->saveByURL(DI::config()->get('system', 'url'));
 
 $spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);
 
 if ($spawn) {
        Worker::spawnWorker();
-       killme();
+       exit();
 }
 
 $run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
@@ -62,6 +82,4 @@ Worker::processQueue($run_cron);
 
 Worker::unclaimProcess();
 
-Worker::endProcess();
-
-killme();
+DI::process()->end();