X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=c84b59e2b7324c5ec6838c3962706e3f306c54c9;hb=34521c228bd69609fa4f475bb2e2e826723fcc16;hp=9d964e7bae1fdc0ca752233a2bf3d0e5a1ad190f;hpb=abbea6f002df23419cd0115adbb556ccfd0fe80e;p=friendica.git

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 9d964e7bae..c84b59e2b7 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -362,7 +362,7 @@ class Worker
 			return false;
 		}
 
-		// Check for existance and validity of the include file
+		// Check for existence and validity of the include file
 		$include = $argv[0];
 
 		if (method_exists(sprintf('Friendica\Worker\%s', $include), 'execute')) {
@@ -590,7 +590,7 @@ class Worker
 		/* With these values we can analyze how effective the worker is.
 		 * The database and rest time should be low since this is the unproductive time.
 		 * The execution time is the productive time.
-		 * By changing parameters like the maximum number of workers we can check the effectivness.
+		 * By changing parameters like the maximum number of workers we can check the effectiveness.
 		*/
 		$dbtotal = round(self::$db_duration, 2);
 		$dbread  = round(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 2);
@@ -601,7 +601,7 @@ class Worker
 		$rest    = round(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 2);
 		$exec    = round($duration, 2);
 
-		Logger::info('Performance:', ['state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
+		Logger::info('Performance:', ['function' => $funcname, 'state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
 
 		self::coolDown();
 
@@ -622,7 +622,7 @@ class Worker
 			Logger::info('Longer than 2 minutes.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration/60, 3)]);
 		}
 
-		Logger::info('Process done.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
+		Logger::info('Process done.', ['function' => $funcname, 'priority' => $queue['priority'], 'retrial' => $queue['retrial'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
 
 		DI::profiler()->saveLog(DI::logger(), 'ID ' . $queue['id'] . ': ' . $funcname);
 	}
@@ -885,7 +885,7 @@ class Worker
 	/**
 	 * Returns waiting jobs for the current process id
 	 *
-	 * @return array|bool waiting workerqueue jobs or FALSE on failture
+	 * @return array|bool waiting workerqueue jobs or FALSE on failure
 	 * @throws \Exception
 	 */
 	private static function getWaitingJobForPID()
@@ -1365,6 +1365,17 @@ class Worker
 		return $new_retrial;
 	}
 
+	/**
+	 * Get the number of retrials for the current worker task
+	 *
+	 * @return integer
+	 */
+	public static function getRetrial(): int
+	{
+		$queue = DI::app()->getQueue();
+		return $queue['retrial'] ?? 0;
+	}
+
 	/**
 	 * Defers the current worker entry
 	 *