Bulk delivery added for all protocols

[friendica.git] / bin / worker.php

diff --git a/bin/worker.php b/bin/worker.php
index a39d04963222ff61bd3d61dc5f295a7301f06823..084ad28979b667dacbfa8bd4600c764e27a8148f 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,10 +21,9 @@
  * Starts the background processing
  */
 
-use Friendica\Network\HTTPException\ForbiddenException;
-
 if (php_sapi_name() !== 'cli') {
-       throw new ForbiddenException();
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
 }
 
 use Dice\Dice;
@@ -41,7 +40,7 @@ $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)) {
+if (!file_exists("index.php") && (sizeof($_SERVER["argv"]) != 0)) {
        $directory = dirname($_SERVER["argv"][0]);
 
        if (substr($directory, 0, 1) != '/') {
@@ -82,8 +81,10 @@ if ($spawn) {
 
 $run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
 
-Worker::processQueue($run_cron);
+$process = DI::process()->create(getmypid(), basename(__FILE__));
+
+Worker::processQueue($run_cron, $process);
 
-Worker::unclaimProcess();
+Worker::unclaimProcess($process);
 
-DI::process()->end();
+DI::process()->delete($process);