X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=307451c05205eb7f811bccf4bcab7f160776dda9;hb=9234c2a48dc220add6a509e9a3cabe8b7798d296;hp=21140b890e24a100fa1e4d46ce128b42f5eb3585;hpb=a4f7fddf411d874fb921e3ec395a10ccfcbc7c8a;p=friendica.git

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 21140b890e..307451c052 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -446,7 +446,7 @@ class Worker
 			$queue['priority'] = PRIORITY_MEDIUM;
 		}
 
-		$a->queue = $queue;
+		$a->setQueue($queue);
 
 		$up_duration = microtime(true) - self::$up_start;
 
@@ -462,7 +462,7 @@ class Worker
 
 		Logger::disableWorker();
 
-		unset($a->queue);
+		$a->setQueue([]);
 
 		$duration = (microtime(true) - $stamp);
 
@@ -831,7 +831,7 @@ class Worker
 		$stamp = (float)microtime(true);
 
 		$queues = DBA::p("SELECT `process`.`pid`, COUNT(`workerqueue`.`pid`) AS `entries` FROM `process`
-			LEFT JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `workerqueue`.`done` 
+			LEFT JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `workerqueue`.`done`
 			GROUP BY `process`.`pid`");
 		while ($queue = DBA::fetch($queues)) {
 			$ids[$queue['pid']] = $queue['entries'];
@@ -1200,7 +1200,7 @@ class Worker
 	 * or: Worker::add(PRIORITY_HIGH, "Notifier", Delivery::DELETION, $drop_id);
 	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "Delivery", $post_id);
 	 *
-	 * @return boolean "false" if worker queue entry already existed or there had been an error
+	 * @return int "0" if worker queue entry already existed or there had been an error, otherwise the ID of the worker task
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note $cmd and string args are surrounded with ""
 	 *
@@ -1213,14 +1213,14 @@ class Worker
 		$args = func_get_args();
 
 		if (!count($args)) {
-			return false;
+			return 0;
 		}
 
 		$arr = ['args' => $args, 'run_cmd' => true];
 
 		Hook::callAll("proc_run", $arr);
 		if (!$arr['run_cmd'] || !count($args)) {
-			return true;
+			return 1;
 		}
 
 		$priority = PRIORITY_MEDIUM;
@@ -1255,7 +1255,7 @@ class Worker
 		$command = array_shift($args);
 		$parameters = json_encode($args);
 		$found = DBA::exists('workerqueue', ['command' => $command, 'parameter' => $parameters, 'done' => false]);
-		$added = false;
+		$added = 0;
 
 		if (!in_array($priority, PRIORITIES)) {
 			Logger::warning('Invalid priority', ['priority' => $priority, 'command' => $command, 'callstack' => System::callstack(20)]);
@@ -1264,15 +1264,15 @@ class Worker
 
 		// Quit if there was a database error - a precaution for the update process to 3.5.3
 		if (DBA::errorNo() != 0) {
-			return false;
+			return 0;
 		}
 
 		if (!$found) {
-			$added = DBA::insert('workerqueue', ['command' => $command, 'parameter' => $parameters, 'created' => $created,
-				'priority' => $priority, 'next_try' => $delayed]);
-			if (!$added) {
-				return false;
+			if (!DBA::insert('workerqueue', ['command' => $command, 'parameter' => $parameters, 'created' => $created,
+				'priority' => $priority, 'next_try' => $delayed])) {
+				return 0;
 			}
+			$added = DBA::lastInsertId();
 		} elseif ($force_priority) {
 			DBA::update('workerqueue', ['priority' => $priority], ['command' => $command, 'parameter' => $parameters, 'done' => false, 'pid' => 0]);
 		}
@@ -1351,12 +1351,12 @@ class Worker
 	 */
 	public static function defer()
 	{
-		if (empty(DI::app()->queue)) {
+		$queue = DI::app()->getQueue();
+
+		if (empty($queue)) {
 			return false;
 		}
 
-		$queue = DI::app()->queue;
-
 		$retrial = $queue['retrial'];
 		$id = $queue['id'];
 		$priority = $queue['priority'];
@@ -1587,7 +1587,7 @@ class Worker
 		} else {
 			Logger::info('We are outside the maintenance window', ['current' => date('H:i:s', $current), 'start' => date('H:i:s', $start), 'end' => date('H:i:s', $end)]);
 		}
-		
+
 		return $execute;
 	}
 }