X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=00b22c78858c0b06c34ca643174b251fca5a5240;hb=3cd654e76f32dbcf505aef6a60a3e42d318f8b61;hp=723cd809da44d3230721afd1eb4e06cf5a17ffb7;hpb=664afbcafbaab91f767dbdd47334db53333f080c;p=friendica.git

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 723cd809da..00b22c7885 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -4,13 +4,11 @@
  */
 namespace Friendica\Core;
 
+use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\BaseObject;
-
-require_once 'include/dba.php';
 
 /**
  * @file src/Core/Worker.php
@@ -33,16 +31,17 @@ class Worker
 	 *
 	 * @param boolean $run_cron Should the cron processes be executed?
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function processQueue($run_cron = true)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		self::$up_start = microtime(true);
 
 		// At first check the maximum load. We shouldn't continue with a high load
 		if ($a->isMaxLoadReached()) {
-			logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
+			Logger::log('Pre check: maximum load reached, quitting.', Logger::DEBUG);
 			return;
 		}
 
@@ -58,25 +57,25 @@ class Worker
 
 		// Count active workers and compare them with a maximum value that depends on the load
 		if (self::tooMuchWorkers()) {
-			logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG);
+			Logger::log('Pre check: Active worker limit reached, quitting.', Logger::DEBUG);
 			return;
 		}
 
 		// Do we have too few memory?
 		if ($a->isMinMemoryReached()) {
-			logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG);
+			Logger::log('Pre check: Memory limit reached, quitting.', Logger::DEBUG);
 			return;
 		}
 
 		// Possibly there are too much database connections
 		if (self::maxConnectionsReached()) {
-			logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG);
+			Logger::log('Pre check: maximum connections reached, quitting.', Logger::DEBUG);
 			return;
 		}
 
 		// Possibly there are too much database processes that block the system
 		if ($a->isMaxProcessesReached()) {
-			logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG);
+			Logger::log('Pre check: maximum processes reached, quitting.', Logger::DEBUG);
 			return;
 		}
 
@@ -99,7 +98,7 @@ class Worker
 
 				// The work will be done
 				if (!self::execute($entry)) {
-					logger('Process execution failed, quitting.', LOGGER_DEBUG);
+					Logger::log('Process execution failed, quitting.', Logger::DEBUG);
 					return;
 				}
 
@@ -117,14 +116,14 @@ class Worker
 				$stamp = (float)microtime(true);
 				// Count active workers and compare them with a maximum value that depends on the load
 				if (self::tooMuchWorkers()) {
-					logger('Active worker limit reached, quitting.', LOGGER_DEBUG);
+					Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
 					Lock::release('worker');
 					return;
 				}
 
 				// Check free memory
 				if ($a->isMinMemoryReached()) {
-					logger('Memory limit reached, quitting.', LOGGER_DEBUG);
+					Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
 					Lock::release('worker');
 					return;
 				}
@@ -134,7 +133,7 @@ class Worker
 
 			// Quit the worker once every 5 minutes
 			if (time() > ($starttime + 300)) {
-				logger('Process lifetime reached, quitting.', LOGGER_DEBUG);
+				Logger::log('Process lifetime reached, quitting.', Logger::DEBUG);
 				return;
 			}
 		}
@@ -143,28 +142,42 @@ class Worker
 		if (Config::get('system', 'worker_daemon_mode', false)) {
 			self::IPCSetJobState(false);
 		}
-		logger("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG);
+		Logger::log("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", Logger::DEBUG);
+	}
+
+	/**
+	 * @brief Returns the number of deferred entries in the worker queue
+	 *
+	 * @return integer Number of deferred entries in the worker queue
+	 * @throws \Exception
+	 */
+	private static function deferredEntries()
+	{
+		return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` > ?",
+			DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
 	}
 
 	/**
 	 * @brief Returns the number of non executed entries in the worker queue
 	 *
 	 * @return integer Number of non executed entries in the worker queue
+	 * @throws \Exception
 	 */
 	private static function totalEntries()
 	{
 		return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
-			NULL_DATE, DateTimeFormat::utcNow()]);
+			DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
 	}
 
 	/**
 	 * @brief Returns the highest priority in the worker queue that isn't executed
 	 *
 	 * @return integer Number of active worker processes
+	 * @throws \Exception
 	 */
 	private static function highestPriority()
 	{
-		$condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()];
+		$condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
 		$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
 		if (DBA::isResult($workerqueue)) {
 			return $workerqueue["priority"];
@@ -179,11 +192,12 @@ class Worker
 	 * @param integer $priority The priority that should be checked
 	 *
 	 * @return integer Is there a process running with that priority?
+	 * @throws \Exception
 	 */
 	private static function processWithPriorityActive($priority)
 	{
 		$condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?",
-			$priority, NULL_DATE, DateTimeFormat::utcNow()];
+			$priority, DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
 		return DBA::exists('workerqueue', $condition);
 	}
 
@@ -193,28 +207,29 @@ class Worker
 	 * @param array $queue Workerqueue entry
 	 *
 	 * @return boolean "true" if further processing should be stopped
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function execute($queue)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		$mypid = getmypid();
 
 		// Quit when in maintenance
 		if (Config::get('system', 'maintenance', false, true)) {
-			logger("Maintenance mode - quit process ".$mypid, LOGGER_DEBUG);
+			Logger::log("Maintenance mode - quit process ".$mypid, Logger::DEBUG);
 			return false;
 		}
 
 		// Constantly check the number of parallel database processes
 		if ($a->isMaxProcessesReached()) {
-			logger("Max processes reached for process ".$mypid, LOGGER_DEBUG);
+			Logger::log("Max processes reached for process ".$mypid, Logger::DEBUG);
 			return false;
 		}
 
 		// Constantly check the number of available database connections to let the frontend be accessible at any time
 		if (self::maxConnectionsReached()) {
-			logger("Max connection reached for process ".$mypid, LOGGER_DEBUG);
+			Logger::log("Max connection reached for process ".$mypid, Logger::DEBUG);
 			return false;
 		}
 
@@ -243,7 +258,9 @@ class Worker
 			self::execFunction($queue, $include, $argv, true);
 
 			$stamp = (float)microtime(true);
-			if (DBA::update('workerqueue', ['done' => true], ['id' => $queue['id']])) {
+
+			$condition = ["`id` = ? AND `next_try` < ?", $queue['id'], DateTimeFormat::utcNow()];
+			if (DBA::update('workerqueue', ['done' => true], $condition)) {
 				Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
 			}
 			self::$db_duration = (microtime(true) - $stamp);
@@ -257,7 +274,7 @@ class Worker
 		}
 
 		if (!validate_include($include)) {
-			logger("Include file ".$argv[0]." is not valid!");
+			Logger::log("Include file ".$argv[0]." is not valid!");
 			DBA::delete('workerqueue', ['id' => $queue["id"]]);
 			return true;
 		}
@@ -289,7 +306,7 @@ class Worker
 			}
 			self::$db_duration = (microtime(true) - $stamp);
 		} else {
-			logger("Function ".$funcname." does not exist");
+			Logger::log("Function ".$funcname." does not exist");
 			DBA::delete('workerqueue', ['id' => $queue["id"]]);
 		}
 
@@ -304,10 +321,11 @@ class Worker
 	 * @param array   $argv        Array of values to be passed to the function
 	 * @param boolean $method_call boolean
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function execFunction($queue, $funcname, $argv, $method_call)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		$mypid = getmypid();
 
@@ -315,7 +333,7 @@ class Worker
 
 		$new_process_id = System::processID("wrk");
 
-		logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
+		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
 
 		$stamp = (float)microtime(true);
 
@@ -365,27 +383,27 @@ class Worker
 		 * The execution time is the productive time.
 		 * By changing parameters like the maximum number of workers we can check the effectivness.
 		*/
-		logger(
+		Logger::log(
 			'DB: '.number_format(self::$db_duration, 2).
 			' - Lock: '.number_format(self::$lock_duration, 2).
 			' - Rest: '.number_format($up_duration - self::$db_duration - self::$lock_duration, 2).
 			' - Execution: '.number_format($duration, 2),
-			LOGGER_DEBUG
+			Logger::DEBUG
 		);
 
 		self::$lock_duration = 0;
 
 		if ($duration > 3600) {
-			logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG);
+			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", Logger::DEBUG);
 		} elseif ($duration > 600) {
-			logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", Logger::DEBUG);
 		} elseif ($duration > 300) {
-			logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", Logger::DEBUG);
 		} elseif ($duration > 120) {
-			logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
+			Logger::log("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", Logger::DEBUG);
 		}
 
-		logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
+		Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds. Process PID: ".$new_process_id);
 
 		// Write down the performance values into the log
 		if (Config::get("system", "profiler")) {
@@ -440,7 +458,7 @@ class Worker
 				}
 			}
 
-			logger(
+			Logger::log(
 				"ID ".$queue["id"].": ".$funcname.": ".sprintf(
 					"DB: %s/%s, Cache: %s/%s, Net: %s, I/O: %s, Other: %s, Total: %s".$o,
 					number_format($a->performance["database"] - $a->performance["database_write"], 2),
@@ -454,14 +472,14 @@ class Worker
 						+ $a->performance["network"] + $a->performance["file"]), 2),
 					number_format($duration, 2)
 				),
-				LOGGER_DEBUG
+				Logger::DEBUG
 			);
 		}
 
 		$cooldown = Config::get("system", "worker_cooldown", 0);
 
 		if ($cooldown > 0) {
-			logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+			Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
 			sleep($cooldown);
 		}
 	}
@@ -470,6 +488,7 @@ class Worker
 	 * @brief Checks if the number of database connections has reached a critical limit.
 	 *
 	 * @return bool Are more than 3/4 of the maximum connections used?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function maxConnectionsReached()
 	{
@@ -505,12 +524,12 @@ class Worker
 			$used = DBA::numRows($r);
 			DBA::close($r);
 
-			logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
+			Logger::log("Connection usage (user values): ".$used."/".$max, Logger::DEBUG);
 
 			$level = ($used / $max) * 100;
 
 			if ($level >= $maxlevel) {
-				logger("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
+				Logger::log("Maximum level (".$maxlevel."%) of user connections reached: ".$used."/".$max);
 				return true;
 			}
 		}
@@ -533,27 +552,28 @@ class Worker
 		if ($used == 0) {
 			return false;
 		}
-		logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG);
+		Logger::log("Connection usage (system values): ".$used."/".$max, Logger::DEBUG);
 
 		$level = $used / $max * 100;
 
 		if ($level < $maxlevel) {
 			return false;
 		}
-		logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
+		Logger::log("Maximum level (".$level."%) of system connections reached: ".$used."/".$max);
 		return true;
 	}
 
 	/**
 	 * @brief fix the queue entry if the worker process died
 	 * @return void
+	 * @throws \Exception
 	 */
 	private static function killStaleWorkers()
 	{
 		$entries = DBA::select(
 			'workerqueue',
 			['id', 'pid', 'executed', 'priority', 'parameter'],
-			['`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE],
+			['`executed` > ? AND NOT `done` AND `pid` != 0', DBA::NULL_DATETIME],
 			['order' => ['priority', 'created']]
 		);
 
@@ -561,7 +581,7 @@ class Worker
 			if (!posix_kill($entry["pid"], 0)) {
 				DBA::update(
 					'workerqueue',
-					['executed' => NULL_DATE, 'pid' => 0],
+					['executed' => DBA::NULL_DATETIME, 'pid' => 0],
 					['id' => $entry["id"]]
 				);
 			} else {
@@ -581,7 +601,7 @@ class Worker
 				// How long is the process already running?
 				$duration = (time() - strtotime($entry["executed"])) / 60;
 				if ($duration > $max_duration) {
-					logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
+					Logger::log("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
 					posix_kill($entry["pid"], SIGTERM);
 
 					// We killed the stale process.
@@ -597,11 +617,11 @@ class Worker
 					}
 					DBA::update(
 						'workerqueue',
-						['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
+						['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
 						['id' => $entry["id"]]
 					);
 				} else {
-					logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
+					Logger::log("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", Logger::DEBUG);
 				}
 			}
 		}
@@ -611,6 +631,7 @@ class Worker
 	 * @brief Checks if the number of active workers exceeds the given limits
 	 *
 	 * @return bool Are there too much workers running?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function tooMuchWorkers()
 	{
@@ -654,9 +675,10 @@ class Worker
 				DBA::close($processes);
 
 				// Now adding all processes with workerqueue entries
-				$entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
+				$entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow());
 				while ($entry = DBA::fetch($entries)) {
-					$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]);
+					$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `next_try` < ? AND `priority` = ?",
+						DateTimeFormat::utcNow(), $entry["priority"]);
 					if ($process = DBA::fetch($processes)) {
 						$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
 					}
@@ -677,22 +699,23 @@ class Worker
 			}
 
 			$entries = self::totalEntries();
+			$deferred = self::deferredEntries();
 
 			if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($entries > 0) && ($active >= $queues)) {
 				$top_priority = self::highestPriority();
 				$high_running = self::processWithPriorityActive($top_priority);
 
 				if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) {
-					logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
+					Logger::log("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", Logger::DEBUG);
 					$queues = $active + 1;
 				}
 			}
 
-			logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
+			Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $entries . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG);
 
 			// Are there fewer workers running as possible? Then fork a new one.
 			if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
-				logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
+				Logger::log("Active workers: ".$active."/".$queues." Fork a new worker.", Logger::DEBUG);
 				if (Config::get('system', 'worker_daemon_mode', false)) {
 					self::IPCSetJobState(true);
 				} else {
@@ -713,6 +736,7 @@ class Worker
 	 * @brief Returns the number of active worker processes
 	 *
 	 * @return integer Number of active worker processes
+	 * @throws \Exception
 	 */
 	private static function activeWorkers()
 	{
@@ -727,6 +751,7 @@ class Worker
 	 *
 	 * @param string $highest_priority Returns the currently highest priority
 	 * @return bool We let pass a slower process than $highest_priority
+	 * @throws \Exception
 	 */
 	private static function passingSlow(&$highest_priority)
 	{
@@ -765,11 +790,11 @@ class Worker
 				++$high;
 			}
 		}
-		logger("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, LOGGER_DEBUG);
+		Logger::log("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, Logger::DEBUG);
 		$passing_slow = (($high/count($priorities)) > (2/3));
 
 		if ($passing_slow) {
-			logger("Passing slower processes than priority ".$highest_priority, LOGGER_DEBUG);
+			Logger::log("Passing slower processes than priority ".$highest_priority, Logger::DEBUG);
 		}
 		return $passing_slow;
 	}
@@ -779,6 +804,7 @@ class Worker
 	 *
 	 * @param boolean $passing_slow Returns if we had passed low priority processes
 	 * @return boolean Have we found something?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function findWorkerProcesses(&$passing_slow)
 	{
@@ -795,13 +821,14 @@ class Worker
 		$queue_length = Config::get('system', 'worker_fetch_limit', 1);
 		$lower_job_limit = $worker_queues * $queue_length * 2;
 		$jobs = self::totalEntries();
+		$deferred = self::deferredEntries();
 
 		// Now do some magic
 		$exponent = 2;
 		$slope = $queue_length / pow($lower_job_limit, $exponent);
 		$limit = min($queue_length, ceil($slope * pow($jobs, $exponent)));
 
-		logger('Total: '.$jobs.' - Maximum: '.$queue_length.' - jobs per queue: '.$limit, LOGGER_DEBUG);
+		Logger::log('Deferred: ' . $deferred . ' - Total: ' . $jobs . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, Logger::DEBUG);
 		$ids = [];
 		if (self::passingSlow($highest_priority)) {
 			// Are there waiting processes with a higher priority than the currently highest?
@@ -809,7 +836,7 @@ class Worker
 				'workerqueue',
 				['id'],
 				["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?",
-				NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
+				DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
 				['limit' => $limit, 'order' => ['priority', 'created']]
 			);
 
@@ -826,7 +853,7 @@ class Worker
 					'workerqueue',
 					['id'],
 					["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?",
-					NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
+					DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
 					['limit' => $limit, 'order' => ['priority', 'created']]
 				);
 
@@ -846,7 +873,7 @@ class Worker
 				'workerqueue',
 				['id'],
 				["`executed` <= ? AND NOT `done` AND `next_try` < ?",
-				NULL_DATE, DateTimeFormat::utcNow()],
+				DBA::NULL_DATETIME, DateTimeFormat::utcNow()],
 				['limit' => $limit, 'order' => ['priority', 'created']]
 			);
 
@@ -872,6 +899,7 @@ class Worker
 	 *
 	 * @param boolean $passing_slow Returns if we had passed low priority processes
 	 * @return string SQL statement
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function workerProcess(&$passing_slow)
 	{
@@ -907,17 +935,19 @@ class Worker
 	/**
 	 * @brief Removes a workerqueue entry from the current process
 	 * @return void
+	 * @throws \Exception
 	 */
 	public static function unclaimProcess()
 	{
 		$mypid = getmypid();
 
-		DBA::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
+		DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
 	}
 
 	/**
 	 * @brief Call the front end worker
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function callWorker()
 	{
@@ -932,6 +962,7 @@ class Worker
 	/**
 	 * @brief Call the front end worker if there aren't any active
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function executeIfIdle()
 	{
@@ -960,7 +991,7 @@ class Worker
 
 			self::runCron();
 
-			logger('Call worker', LOGGER_DEBUG);
+			Logger::log('Call worker', Logger::DEBUG);
 			self::spawnWorker();
 			return;
 		}
@@ -982,6 +1013,7 @@ class Worker
 	/**
 	 * @brief Removes long running worker processes
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function clearProcesses()
 	{
@@ -996,10 +1028,11 @@ class Worker
 	/**
 	 * @brief Runs the cron processes
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function runCron()
 	{
-		logger('Add cron entries', LOGGER_DEBUG);
+		Logger::log('Add cron entries', Logger::DEBUG);
 
 		// Check for spooled items
 		self::add(PRIORITY_HIGH, "SpoolPost");
@@ -1013,7 +1046,9 @@ class Worker
 
 	/**
 	 * @brief Spawns a new worker
+	 * @param bool $do_cron
 	 * @return void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function spawnWorker($do_cron = false)
 	{
@@ -1038,12 +1073,13 @@ class Worker
 	 * or: Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
 	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowEntry", $post_id);
 	 *
+	 * @return boolean "false" if proc_run couldn't be executed
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @note $cmd and string args are surrounded with ""
 	 *
 	 * @hooks 'proc_run'
-	 * 	array $arr
+	 *    array $arr
 	 *
-	 * @return boolean "false" if proc_run couldn't be executed
 	 */
 	public static function add($cmd)
 	{
@@ -1055,7 +1091,7 @@ class Worker
 
 		$arr = ['args' => $args, 'run_cmd' => true];
 
-		Addon::callHooks("proc_run", $arr);
+		Hook::callAll("proc_run", $arr);
 		if (!$arr['run_cmd'] || !count($args)) {
 			return true;
 		}
@@ -1137,17 +1173,17 @@ class Worker
 		$id = $queue['id'];
 
 		if ($retrial > 14) {
-			logger('Id ' . $id . ' had been tried 14 times, it will be deleted now.', LOGGER_DEBUG);
-			DBA::delete('workerqueue', ['id' => $id]);
+			Logger::log('Id ' . $id . ' had been tried 14 times. We stop now.', Logger::DEBUG);
+			return;
 		}
 
 		// Calculate the delay until the next trial
 		$delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
 		$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
 
-		logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
+		Logger::log('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, Logger::DEBUG);
 
-		$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0];
+		$fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0];
 		DBA::update('workerqueue', $fields, ['id' => $id]);
 	}
 
@@ -1172,6 +1208,7 @@ class Worker
 	 *
 	 * @brief Remove the active process from the "process" table
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function endProcess()
 	{
@@ -1183,6 +1220,7 @@ class Worker
 	 *
 	 * @brief Set the flag if some job is waiting
 	 * @param boolean $jobs Is there a waiting job?
+	 * @throws \Exception
 	 */
 	public static function IPCSetJobState($jobs)
 	{
@@ -1194,6 +1232,7 @@ class Worker
 	 *
 	 * @brief Checks if some worker job waits to be executed
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public static function IPCJobsExists()
 	{