X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fworker.php;h=2b5915f471d4fc76b9fdfdee1bad2ff42318cea0;hb=d51b9226a62817ed589cd5ad4f98e1958511796a;hp=b4b265283ccba3d60ea44a38ffc9b6d48c0a92e0;hpb=9665f4ed415d34cbcf09df8c6ca04882303e9544;p=friendica.git

diff --git a/bin/worker.php b/bin/worker.php
index b4b265283c..2b5915f471 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -6,61 +6,53 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Update;
 use Friendica\Core\Worker;
+use Friendica\Factory;
+
+// Get options
+$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_once "include/dba.php";
-
-$a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
-
-require_once ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
-unset($db_host, $db_user, $db_pass, $db_data);
+require dirname(__DIR__) . '/vendor/autoload.php';
 
-Config::load();
+$a = Factory\DependencyFactory::setUp('worker', dirname(__DIR__));
 
 // Check the database structure and possibly fixes it
-check_db(true);
+Update::check($a->getBasePath(), true, $a->getMode());
 
 // Quit when in maintenance
-if (Config::get('system', 'maintenance', false, true)) {
+if (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED)) {
 	return;
 }
 
-$a->set_baseurl(Config::get('system', 'url'));
+$a->setBaseURL(Config::get('system', 'url'));
 
-Addon::loadHooks();
-
-$spawn = (($_SERVER["argc"] == 2) && ($_SERVER["argv"][1] == "spawn"));
+$spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);
 
 if ($spawn) {
 	Worker::spawnWorker();
-	killme();
+	exit();
 }
 
-$run_cron = (($_SERVER["argc"] <= 1) || ($_SERVER["argv"][1] != "no_cron"));
+$run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
 
 Worker::processQueue($run_cron);
 
 Worker::unclaimProcess();
 
 Worker::endProcess();
-
-killme();
-