X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fworker.php;h=52400a045a4e4b9d57051edbed9c6289ece7e412;hb=686bf6b32f32852a24286f053feb1c293361e3b6;hp=d821fe626a6b47183ed6937df97544f385af8b33;hpb=f2b97f932095ed76656be09e3ba94646187808dc;p=friendica.git

diff --git a/bin/worker.php b/bin/worker.php
index d821fe626a..52400a045a 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -1,63 +1,87 @@
 #!/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\App\Mode;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
+use Friendica\DI;
+use Psr\Log\LoggerInterface;
 
 // Get options
-$shortopts = 'sc';
-$longopts = ['spawn', 'cron'];
+$shortopts = 'sn';
+$longopts = ['spawn', 'no_cron'];
 $options = getopt($shortopts, $longopts);
 
 // Ensure that worker.php is executed from the base path of the installation
 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";
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
 
-$a = new App(dirname(__DIR__));
+DI::init($dice);
+$a = DI::app();
 
-Config::load();
+DI::mode()->setExecutor(Mode::WORKER);
 
 // 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->set_baseurl(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('c', $options) || array_key_exists('cron', $options);
+$run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
 
 Worker::processQueue($run_cron);
 
 Worker::unclaimProcess();
 
-Worker::endProcess();
-
-killme();
+DI::process()->end();