Merge pull request #6435 from annando/nextcloud

[friendica.git] / bin / worker.php

diff --git a/bin/worker.php b/bin/worker.php
old mode 100644 (file)
new mode 100755 (executable)
index 67f9fed..78b6da5
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -4,63 +4,53 @@
  * @file bin/worker.php
  * @brief Starts the background processing
  */
-
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Core\Update;
+
+// 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";
+require dirname(__DIR__) . '/vendor/autoload.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);
-
-Config::load();
 
 // Check the database structure and possibly fixes it
-check_db(true);
+Update::check(true);
 
 // Quit when in maintenance
-if (Config::get('system', 'maintenance', 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();
 }
 
-$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();
-