X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=96f3e7ae042e30fae459cff6ca272d6f1bdba261;hb=87bb4d44a2eccec4180b9cd0a70f9011b3b759bc;hp=69ca6004ceb5d4ece347c20b677c6ed501bab226;hpb=4c52772d84eaf96d18e68ec0e546b648105221aa;p=friendica.git

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 69ca6004ce..96f3e7ae04 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -31,12 +31,20 @@ use Friendica\Util\DateTimeFormat;
  */
 class Worker
 {
-	const PRIORITY_UNDEFINED  = PRIORITY_UNDEFINED;
-	const PRIORITY_CRITICAL   = PRIORITY_CRITICAL;
-	const PRIORITY_HIGH       = PRIORITY_HIGH;
-	const PRIORITY_MEDIUM     = PRIORITY_MEDIUM;
-	const PRIORITY_LOW        = PRIORITY_LOW;
-	const PRIORITY_NEGLIGIBLE = PRIORITY_NEGLIGIBLE;
+	/**
+	 * @name Priority
+	 *
+	 * Process priority for the worker
+	 * @{
+	 */
+	const PRIORITY_UNDEFINED  = 0;
+	const PRIORITY_CRITICAL   = 10;
+	const PRIORITY_HIGH       = 20;
+	const PRIORITY_MEDIUM     = 30;
+	const PRIORITY_LOW        = 40;
+	const PRIORITY_NEGLIGIBLE = 50;
+	const PRIORITIES          = [self::PRIORITY_CRITICAL, self::PRIORITY_HIGH, self::PRIORITY_MEDIUM, self::PRIORITY_LOW, self::PRIORITY_NEGLIGIBLE];
+	/* @}*/
 
 	const STATE_STARTUP    = 1; // Worker is in startup. This takes most time.
 	const STATE_LONG_LOOP  = 2; // Worker is processing the whole - long - loop.
@@ -307,17 +315,7 @@ class Worker
 			return false;
 		}
 
-		$valid = false;
-		if (strpos($file, 'include/') === 0) {
-			$valid = true;
-		}
-
-		if (strpos($file, 'addon/') === 0) {
-			$valid = true;
-		}
-
-		// Simply return flag
-		return $valid;
+		return (strpos($file, 'addon/') === 0);
 	}
 
 	/**
@@ -398,11 +396,6 @@ class Worker
 			return true;
 		}
 
-		// The script could be provided as full path or only with the function name
-		if ($include == basename($include)) {
-			$include = 'include/' . $include . '.php';
-		}
-
 		if (!self::validateInclude($include)) {
 			Logger::warning('Include file is not valid', ['file' => $argv[0]]);
 			$stamp = (float)microtime(true);
@@ -461,6 +454,10 @@ class Worker
 		$load_cooldown      = DI::config()->get('system', 'worker_load_cooldown');
 		$processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown');
 
+		if ($load_cooldown == 0) {
+			$load_cooldown = DI::config()->get('system', 'maxloadavg');
+		}
+
 		if (($load_cooldown == 0) && ($processes_cooldown == 0)) {
 			return false;
 		}
@@ -501,6 +498,10 @@ class Worker
 		$load_cooldown      = DI::config()->get('system', 'worker_load_cooldown');
 		$processes_cooldown = DI::config()->get('system', 'worker_processes_cooldown');
 
+		if ($load_cooldown == 0) {
+			$load_cooldown = DI::config()->get('system', 'maxloadavg');
+		}
+
 		if (($load_cooldown == 0) && ($processes_cooldown == 0)) {
 			return;
 		}
@@ -799,7 +800,7 @@ class Worker
 				$top_priority = self::highestPriority();
 				$high_running = self::processWithPriorityActive($top_priority);
 
-				if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) {
+				if (!$high_running && ($top_priority > self::PRIORITY_UNDEFINED) && ($top_priority < self::PRIORITY_NEGLIGIBLE)) {
 					Logger::info('Jobs with a higher priority are waiting but none is executed. Open a fastlane.', ['priority' => $top_priority]);
 					$queues = $active + 1;
 				}
@@ -931,7 +932,7 @@ class Worker
 	private static function nextPriority()
 	{
 		$waiting = [];
-		$priorities = [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE];
+		$priorities = [self::PRIORITY_CRITICAL, self::PRIORITY_HIGH, self::PRIORITY_MEDIUM, self::PRIORITY_LOW, self::PRIORITY_NEGLIGIBLE];
 		foreach ($priorities as $priority) {
 			$stamp = (float)microtime(true);
 			if (DBA::exists('workerqueue', ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()])) {
@@ -940,8 +941,8 @@ class Worker
 			self::$db_duration += (microtime(true) - $stamp);
 		}
 
-		if (!empty($waiting[PRIORITY_CRITICAL])) {
-			return PRIORITY_CRITICAL;
+		if (!empty($waiting[self::PRIORITY_CRITICAL])) {
+			return self::PRIORITY_CRITICAL;
 		}
 
 		$running = [];
@@ -1198,8 +1199,8 @@ class Worker
 	 * @param (integer|array) priority or parameter array, strings are deprecated and are ignored
 	 *
 	 * next args are passed as $cmd command line
-	 * or: Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::DELETION, $drop_id);
-	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'Delivery', $post_id);
+	 * or: Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::DELETION, $drop_id);
+	 * or: Worker::add(array('priority' => Worker::PRIORITY_HIGH, 'dont_fork' => true), 'Delivery', $post_id);
 	 *
 	 * @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
@@ -1222,7 +1223,7 @@ class Worker
 			return 1;
 		}
 
-		$priority = PRIORITY_MEDIUM;
+		$priority = self::PRIORITY_MEDIUM;
 		// Don't fork from frontend tasks by default
 		$dont_fork = DI::config()->get('system', 'worker_dont_fork', false) || !DI::mode()->isBackend();
 		$created = DateTimeFormat::utcNow();
@@ -1258,9 +1259,9 @@ class Worker
 		$found = DBA::exists('workerqueue', ['command' => $command, 'parameter' => $parameters, 'done' => false]);
 		$added = 0;
 
-		if (!is_int($priority) || !in_array($priority, PRIORITIES)) {
+		if (!is_int($priority) || !in_array($priority, self::PRIORITIES)) {
 			Logger::warning('Invalid priority', ['priority' => $priority, 'command' => $command, 'callstack' => System::callstack(20)]);
-			$priority = PRIORITY_MEDIUM;
+			$priority = self::PRIORITY_MEDIUM;
 		}
 
 		// Quit if there was a database error - a precaution for the update process to 3.5.3
@@ -1375,12 +1376,12 @@ class Worker
 		$delay = (($new_retrial + 2) ** 4) + (rand(1, 30) * ($new_retrial));
 		$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
 
-		if (($priority < PRIORITY_MEDIUM) && ($new_retrial > 3)) {
-			$priority = PRIORITY_MEDIUM;
-		} elseif (($priority < PRIORITY_LOW) && ($new_retrial > 6)) {
-			$priority = PRIORITY_LOW;
-		} elseif (($priority < PRIORITY_NEGLIGIBLE) && ($new_retrial > 8)) {
-			$priority = PRIORITY_NEGLIGIBLE;
+		if (($priority < self::PRIORITY_MEDIUM) && ($new_retrial > 3)) {
+			$priority = self::PRIORITY_MEDIUM;
+		} elseif (($priority < self::PRIORITY_LOW) && ($new_retrial > 6)) {
+			$priority = self::PRIORITY_LOW;
+		} elseif (($priority < self::PRIORITY_NEGLIGIBLE) && ($new_retrial > 8)) {
+			$priority = self::PRIORITY_NEGLIGIBLE;
 		}
 
 		Logger::info('Deferred task', ['id' => $id, 'retrial' => $new_retrial, 'created' => $queue['created'], 'next_execution' => $next, 'old_prio' => $queue['priority'], 'new_prio' => $priority]);