X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker.php;h=c9a8bcbddaa0ad908f1b86f0d0c45b3dc4e908ed;hb=01afa7af3042fb56b119e7077c58162e5043c619;hp=f24df5252d4479bf9c4105039b706c2d0bd061f5;hpb=9b7432781b1a3e33713b17b55ab94529f6f9de36;p=friendica.git diff --git a/src/Core/Worker.php b/src/Core/Worker.php index f24df5252d..c9a8bcbdda 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -1,24 +1,34 @@ . + * */ + namespace Friendica\Core; -use Friendica\BaseObject; use Friendica\Core; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Process; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; /** - * @file src/Core/Worker.php - * - * @brief Contains the class for the worker background job processing - */ - -/** - * @brief Worker methods + * Contains the class for the worker background job processing */ class Worker { @@ -29,6 +39,8 @@ class Worker const FAST_COMMANDS = ['APDelivery', 'Delivery', 'CreateShadowEntry']; + const LOCK_PROCESS = 'worker_process'; + const LOCK_WORKER = 'worker'; private static $up_start; private static $db_duration = 0; @@ -40,7 +52,7 @@ class Worker private static $state; /** - * @brief Processes the tasks that are in the workerqueue table + * Processes the tasks that are in the workerqueue table * * @param boolean $run_cron Should the cron processes be executed? * @return void @@ -48,16 +60,14 @@ class Worker */ public static function processQueue($run_cron = true) { - $a = \get_app(); - // Ensure that all "strtotime" operations do run timezone independent date_default_timezone_set('UTC'); self::$up_start = microtime(true); // At first check the maximum load. We shouldn't continue with a high load - if ($a->isMaxLoadReached()) { - Logger::log('Pre check: maximum load reached, quitting.', Logger::DEBUG); + if (DI::process()->isMaxLoadReached()) { + Logger::info('Pre check: maximum load reached, quitting.'); return; } @@ -65,33 +75,33 @@ class Worker self::startProcess(); // Kill stale processes every 5 minutes - $last_cleanup = Config::get('system', 'worker_last_cleaned', 0); + $last_cleanup = DI::config()->get('system', 'worker_last_cleaned', 0); if (time() > ($last_cleanup + 300)) { - Config::set('system', 'worker_last_cleaned', time()); + DI::config()->set('system', 'worker_last_cleaned', time()); self::killStaleWorkers(); } // Count active workers and compare them with a maximum value that depends on the load if (self::tooMuchWorkers()) { - Logger::log('Pre check: Active worker limit reached, quitting.', Logger::DEBUG); + Logger::info('Pre check: Active worker limit reached, quitting.'); return; } // Do we have too few memory? - if ($a->isMinMemoryReached()) { - Logger::log('Pre check: Memory limit reached, quitting.', Logger::DEBUG); + if (DI::process()->isMinMemoryReached()) { + Logger::info('Pre check: Memory limit reached, quitting.'); return; } // Possibly there are too much database connections if (self::maxConnectionsReached()) { - Logger::log('Pre check: maximum connections reached, quitting.', Logger::DEBUG); + Logger::info('Pre check: maximum connections reached, quitting.'); return; } // Possibly there are too much database processes that block the system - if ($a->isMaxProcessesReached()) { - Logger::log('Pre check: maximum processes reached, quitting.', Logger::DEBUG); + if (DI::process()->isMaxProcessesReached()) { + Logger::info('Pre check: maximum processes reached, quitting.'); return; } @@ -112,14 +122,14 @@ class Worker // The work will be done if (!self::execute($entry)) { - Logger::log('Process execution failed, quitting.', Logger::DEBUG); + Logger::info('Process execution failed, quitting.'); return; } // Trying to fetch new processes - but only once when successful - if (!$refetched && Lock::acquire('worker_process', 0)) { + if (!$refetched && DI::lock()->acquire(self::LOCK_PROCESS, 0)) { self::findWorkerProcesses(); - Lock::release('worker_process'); + DI::lock()->release(self::LOCK_PROCESS); self::$state = self::STATE_REFETCH; $refetched = true; } else { @@ -131,26 +141,26 @@ class Worker if (!self::getWaitingJobForPID()) { self::$state = self::STATE_LONG_LOOP; - if (Lock::acquire('worker', 0)) { + if (DI::lock()->acquire(self::LOCK_WORKER, 0)) { // Count active workers and compare them with a maximum value that depends on the load if (self::tooMuchWorkers()) { - Logger::log('Active worker limit reached, quitting.', Logger::DEBUG); - Lock::release('worker'); + Logger::info('Active worker limit reached, quitting.'); + DI::lock()->release(self::LOCK_WORKER); return; } // Check free memory - if ($a->isMinMemoryReached()) { - Logger::log('Memory limit reached, quitting.', Logger::DEBUG); - Lock::release('worker'); + if (DI::process()->isMinMemoryReached()) { + Logger::info('Memory limit reached, quitting.'); + DI::lock()->release(self::LOCK_WORKER); return; } - Lock::release('worker'); + DI::lock()->release(self::LOCK_WORKER); } } // Quit the worker once every cron interval - if (time() > ($starttime + (Config::get('system', 'cron_interval') * 60))) { + if (time() > ($starttime + (DI::config()->get('system', 'cron_interval') * 60))) { Logger::info('Process lifetime reached, respawning.'); self::spawnWorker(); return; @@ -158,14 +168,14 @@ class Worker } // Cleaning up. Possibly not needed, but it doesn't harm anything. - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(false); } - Logger::log("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", Logger::DEBUG); + Logger::info("Couldn't select a workerqueue entry, quitting process", ['pid' => getmypid()]); } /** - * @brief Check if non executed tasks do exist in the worker queue + * Check if non executed tasks do exist in the worker queue * * @return boolean Returns "true" if tasks are existing * @throws \Exception @@ -179,7 +189,7 @@ class Worker } /** - * @brief Returns the number of deferred entries in the worker queue + * Returns the number of deferred entries in the worker queue * * @return integer Number of deferred entries in the worker queue * @throws \Exception @@ -194,7 +204,7 @@ class Worker } /** - * @brief Returns the number of non executed entries in the worker queue + * Returns the number of non executed entries in the worker queue * * @return integer Number of non executed entries in the worker queue * @throws \Exception @@ -209,7 +219,7 @@ class Worker } /** - * @brief Returns the highest priority in the worker queue that isn't executed + * Returns the highest priority in the worker queue that isn't executed * * @return integer Number of active worker processes * @throws \Exception @@ -228,7 +238,7 @@ class Worker } /** - * @brief Returns if a process with the given priority is running + * Returns if a process with the given priority is running * * @param integer $priority The priority that should be checked * @@ -242,7 +252,7 @@ class Worker } /** - * @brief Execute a worker entry + * Execute a worker entry * * @param array $queue Workerqueue entry * @@ -251,29 +261,31 @@ class Worker */ public static function execute($queue) { - $a = \get_app(); - $mypid = getmypid(); // Quit when in maintenance - if (Config::get('system', 'maintenance', false, true)) { - Logger::log("Maintenance mode - quit process ".$mypid, Logger::DEBUG); + if (DI::config()->get('system', 'maintenance', false, true)) { + Logger::info("Maintenance mode - quit process", ['pid' => $mypid]); return false; } // Constantly check the number of parallel database processes - if ($a->isMaxProcessesReached()) { - Logger::log("Max processes reached for process ".$mypid, Logger::DEBUG); + if (DI::process()->isMaxProcessesReached()) { + Logger::info("Max processes reached for process", ['pid' => $mypid]); return false; } // Constantly check the number of available database connections to let the frontend be accessible at any time if (self::maxConnectionsReached()) { - Logger::log("Max connection reached for process ".$mypid, Logger::DEBUG); + Logger::info("Max connection reached for process", ['pid' => $mypid]); return false; } $argv = json_decode($queue["parameter"], true); + if (empty($argv)) { + Logger::error('Parameter is empty', ['queue' => $queue]); + return false; + } // Check for existance and validity of the include file $include = $argv[0]; @@ -301,7 +313,7 @@ class Worker $stamp = (float)microtime(true); $condition = ["`id` = ? AND `next_try` < ?", $queue['id'], DateTimeFormat::utcNow()]; if (DBA::update('workerqueue', ['done' => true], $condition)) { - Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); + DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); self::$db_duration_write += (microtime(true) - $stamp); @@ -347,7 +359,7 @@ class Worker $stamp = (float)microtime(true); if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) { - Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow()); + DI::config()->set('system', 'last_worker_execution', DateTimeFormat::utcNow()); } self::$db_duration = (microtime(true) - $stamp); self::$db_duration_write += (microtime(true) - $stamp); @@ -363,7 +375,7 @@ class Worker } /** - * @brief Execute a function from the queue + * Execute a function from the queue * * @param array $queue Workerqueue entry * @param string $funcname name of the function @@ -374,9 +386,7 @@ class Worker */ private static function execFunction($queue, $funcname, $argv, $method_call) { - $a = \get_app(); - - $argc = count($argv); + $a = DI::app(); Logger::enableWorker($funcname); @@ -386,7 +396,7 @@ class Worker // We use the callstack here to analyze the performance of executed worker entries. // For this reason the variables have to be initialized. - $a->getProfiler()->reset(); + DI::profiler()->reset(); $a->queue = $queue; @@ -399,7 +409,7 @@ class Worker if ($method_call) { call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv); } else { - $funcname($argv, $argc); + $funcname($argv, count($argv)); } Logger::disableWorker(); @@ -443,9 +453,9 @@ class Worker Logger::info('Process done.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration, 3)]); - $a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname); + DI::profiler()->saveLog(DI::logger(), "ID " . $queue["id"] . ": " . $funcname); - $cooldown = Config::get("system", "worker_cooldown", 0); + $cooldown = DI::config()->get("system", "worker_cooldown", 0); if ($cooldown > 0) { Logger::info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]); @@ -454,7 +464,7 @@ class Worker } /** - * @brief Checks if the number of database connections has reached a critical limit. + * 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 @@ -462,10 +472,10 @@ class Worker private static function maxConnectionsReached() { // Fetch the max value from the config. This is needed when the system cannot detect the correct value by itself. - $max = Config::get("system", "max_connections"); + $max = DI::config()->get("system", "max_connections"); // Fetch the percentage level where the worker will get active - $maxlevel = Config::get("system", "max_connections_level", 75); + $maxlevel = DI::config()->get("system", "max_connections_level", 75); if ($max == 0) { // the maximum number of possible user connections can be a system variable @@ -497,7 +507,7 @@ class Worker $used = DBA::numRows($r); DBA::close($r); - Logger::log("Connection usage (user values): ".$used."/".$max, Logger::DEBUG); + Logger::info("Connection usage (user values)", ['usage' => $used, 'max' => $max]); $level = ($used / $max) * 100; @@ -525,7 +535,7 @@ class Worker if ($used == 0) { return false; } - Logger::log("Connection usage (system values): ".$used."/".$max, Logger::DEBUG); + Logger::info("Connection usage (system values)", ['used' => $used, 'max' => $max]); $level = $used / $max * 100; @@ -537,7 +547,8 @@ class Worker } /** - * @brief fix the queue entry if the worker process died + * fix the queue entry if the worker process died + * * @return void * @throws \Exception */ @@ -574,6 +585,10 @@ class Worker $max_duration = $max_duration_defaults[$entry["priority"]]; $argv = json_decode($entry["parameter"], true); + if (empty($argv)) { + return; + } + $argv[0] = basename($argv[0]); // How long is the process already running? @@ -602,21 +617,22 @@ class Worker self::$db_duration += (microtime(true) - $stamp); self::$db_duration_write += (microtime(true) - $stamp); } else { - 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); + Logger::info('Process runtime is okay', ['pid' => $entry["pid"], 'duration' => $duration, 'max' => $max_duration, 'command' => substr(json_encode($argv), 0, 50)]); } } } + DBA::close($entries); } /** - * @brief Checks if the number of active workers exceeds the given limits + * Checks if the number of active workers exceeds the given limits * * @return bool Are there too much workers running? * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function tooMuchWorkers() { - $queues = Config::get("system", "worker_queues", 10); + $queues = DI::config()->get("system", "worker_queues", 10); $maxqueues = $queues; @@ -625,21 +641,21 @@ class Worker // Decrease the number of workers at higher load $load = System::currentLoad(); if ($load) { - $maxsysload = intval(Config::get("system", "maxloadavg", 20)); + $maxsysload = intval(DI::config()->get("system", "maxloadavg", 20)); /* Default exponent 3 causes queues to rapidly decrease as load increases. * If you have 20 max queues at idle, then you get only 5 queues at 37.1% of $maxsysload. * For some environments, this rapid decrease is not needed. * With exponent 1, you could have 20 max queues at idle and 13 at 37% of $maxsysload. */ - $exponent = intval(Config::get('system', 'worker_load_exponent', 3)); + $exponent = intval(DI::config()->get('system', 'worker_load_exponent', 3)); $slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent); $queues = intval(ceil($slope * $maxqueues)); $processlist = ''; - if (Config::get('system', 'worker_jpm')) { - $intervals = explode(',', Config::get('system', 'worker_jpm_range')); + if (DI::config()->get('system', 'worker_jpm')) { + $intervals = explode(',', DI::config()->get('system', 'worker_jpm_range')); $jobs_per_minute = []; foreach ($intervals as $interval) { if ($interval == 0) { @@ -667,16 +683,16 @@ class Worker $deferred = self::deferredEntries(); - if (Config::get('system', 'worker_debug')) { + if (DI::config()->get('system', 'worker_debug')) { $waiting_processes = 0; // Now adding all processes with workerqueue entries $stamp = (float)microtime(true); - $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `next_try` < ? GROUP BY `priority`", DateTimeFormat::utcNow()); + $jobs = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`"); self::$db_duration += (microtime(true) - $stamp); self::$db_duration_stat += (microtime(true) - $stamp); while ($entry = DBA::fetch($jobs)) { $stamp = (float)microtime(true); - $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE NOT `done` AND `priority` = ?", $entry["priority"]); + $processes = DBA::p("SELECT COUNT(*) AS `running` FROM `workerqueue-view` WHERE `priority` = ?", $entry["priority"]); self::$db_duration += (microtime(true) - $stamp); self::$db_duration_stat += (microtime(true) - $stamp); if ($process = DBA::fetch($processes)) { @@ -690,7 +706,7 @@ class Worker } else { $waiting_processes = self::totalEntries(); $stamp = (float)microtime(true); - $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`"); + $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority` ORDER BY `priority`"); self::$db_duration += (microtime(true) - $stamp); self::$db_duration_stat += (microtime(true) - $stamp); @@ -707,22 +723,22 @@ class Worker $processlist .= ' ('.implode(', ', $listitem).')'; - if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) { + if (DI::config()->get("system", "worker_fastlane", false) && ($queues > 0) && ($active >= $queues) && self::entriesExists()) { $top_priority = self::highestPriority(); $high_running = self::processWithPriorityActive($top_priority); if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) { - Logger::log("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", Logger::DEBUG); + Logger::info("Jobs with a higher priority are waiting but none is executed. Open a fastlane.", ['priority' => $top_priority]); $queues = $active + 1; } } - Logger::log("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues, Logger::DEBUG); + Logger::notice("Load: " . $load ."/" . $maxsysload . " - processes: " . $deferred . "/" . $active . "/" . $waiting_processes . $processlist . " - maximum: " . $queues . "/" . $maxqueues); // Are there fewer workers running as possible? Then fork a new one. - if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && self::entriesExists()) { - Logger::log("Active workers: ".$active."/".$queues." Fork a new worker.", Logger::DEBUG); - if (Config::get('system', 'worker_daemon_mode', false)) { + if (!DI::config()->get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && self::entriesExists()) { + Logger::info("There are fewer workers as possible, fork a new worker.", ['active' => $active, 'queues' => $queues]); + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(true); } else { self::spawnWorker(); @@ -731,7 +747,7 @@ class Worker } // if there are too much worker, we don't spawn a new one. - if (Config::get('system', 'worker_daemon_mode', false) && ($active > $queues)) { + if (DI::config()->get('system', 'worker_daemon_mode', false) && ($active > $queues)) { self::IPCSetJobState(false); } @@ -739,7 +755,7 @@ class Worker } /** - * @brief Returns the number of active worker processes + * Returns the number of active worker processes * * @return integer Number of active worker processes * @throws \Exception @@ -753,7 +769,7 @@ class Worker } /** - * @brief Returns waiting jobs for the current process id + * Returns waiting jobs for the current process id * * @return array waiting workerqueue jobs * @throws \Exception @@ -772,7 +788,7 @@ class Worker } /** - * @brief Returns the next jobs that should be executed + * Returns the next jobs that should be executed * * @return array array with next jobs * @throws \Exception @@ -785,7 +801,7 @@ class Worker return []; } - $limit = Config::get('system', 'worker_fetch_limit', 1); + $limit = DI::config()->get('system', 'worker_fetch_limit', 1); $ids = []; $stamp = (float)microtime(true); @@ -807,7 +823,7 @@ class Worker } /** - * @brief Returns the priority of the next workerqueue job + * Returns the priority of the next workerqueue job * * @return string priority * @throws \Exception @@ -831,9 +847,7 @@ class Worker $running = []; $running_total = 0; $stamp = (float)microtime(true); - $processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process` - INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` - WHERE NOT `done` GROUP BY `priority`"); + $processes = DBA::p("SELECT COUNT(DISTINCT(`pid`)) AS `running`, `priority` FROM `workerqueue-view` GROUP BY `priority`"); self::$db_duration += (microtime(true) - $stamp); while ($process = DBA::fetch($processes)) { $running[$process['priority']] = $process['running']; @@ -880,7 +894,7 @@ class Worker } /** - * @brief Find and claim the next worker process for us + * Find and claim the next worker process for us * * @return boolean Have we found something? * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -893,7 +907,7 @@ class Worker // If there is no result we check without priority limit if (empty($ids)) { - $limit = Config::get('system', 'worker_fetch_limit', 1); + $limit = DI::config()->get('system', 'worker_fetch_limit', 1); $stamp = (float)microtime(true); $condition = ["`pid` = 0 AND NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()]; @@ -923,9 +937,9 @@ class Worker } /** - * @brief Returns the next worker process + * Returns the next worker process * - * @return string SQL statement + * @return array worker processes * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function workerProcess() @@ -937,14 +951,14 @@ class Worker } $stamp = (float)microtime(true); - if (!Lock::acquire('worker_process')) { + if (!DI::lock()->acquire(self::LOCK_PROCESS)) { return false; } self::$lock_duration += (microtime(true) - $stamp); $found = self::findWorkerProcesses(); - Lock::release('worker_process'); + DI::lock()->release(self::LOCK_PROCESS); if ($found) { $stamp = (float)microtime(true); @@ -956,7 +970,8 @@ class Worker } /** - * @brief Removes a workerqueue entry from the current process + * Removes a workerqueue entry from the current process + * * @return void * @throws \Exception */ @@ -971,28 +986,30 @@ class Worker } /** - * @brief Call the front end worker + * Call the front end worker + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function callWorker() { - if (!Config::get("system", "frontend_worker")) { + if (!DI::config()->get("system", "frontend_worker")) { return; } - $url = System::baseUrl()."/worker"; - Network::fetchUrl($url, false, 1); + $url = DI::baseUrl() . '/worker'; + DI::httpRequest()->fetch($url, false, 1); } /** - * @brief Call the front end worker if there aren't any active + * Call the front end worker if there aren't any active + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function executeIfIdle() { - if (!Config::get("system", "frontend_worker")) { + if (!DI::config()->get("system", "frontend_worker")) { return; } @@ -1000,11 +1017,11 @@ class Worker if (function_exists("proc_open")) { // When was the last time that we called the worker? // Less than one minute? Then we quit - if ((time() - Config::get("system", "worker_started")) < 60) { + if ((time() - DI::config()->get("system", "worker_started")) < 60) { return; } - Config::set("system", "worker_started", time()); + DI::config()->set("system", "worker_started", time()); // Do we have enough running workers? Then we quit here. if (self::tooMuchWorkers()) { @@ -1017,7 +1034,7 @@ class Worker self::runCron(); - Logger::log('Call worker', Logger::DEBUG); + Logger::info('Call worker'); self::spawnWorker(); return; } @@ -1037,13 +1054,14 @@ class Worker } /** - * @brief Removes long running worker processes + * Removes long running worker processes + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function clearProcesses() { - $timeout = Config::get("system", "frontend_worker_timeout", 10); + $timeout = DI::config()->get("system", "frontend_worker_timeout", 10); /// @todo We should clean up the corresponding workerqueue entries as well $stamp = (float)microtime(true); @@ -1055,13 +1073,14 @@ class Worker } /** - * @brief Runs the cron processes + * Runs the cron processes + * * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private static function runCron() { - Logger::log('Add cron entries', Logger::DEBUG); + Logger::info('Add cron entries'); // Check for spooled items self::add(['priority' => PRIORITY_HIGH, 'force_priority' => true], 'SpoolPost'); @@ -1074,7 +1093,8 @@ class Worker } /** - * @brief Spawns a new worker + * Spawns a new worker + * * @param bool $do_cron * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException @@ -1085,18 +1105,18 @@ class Worker $args = ['no_cron' => !$do_cron]; - $a = get_app(); - $process = new Core\Process($a->getLogger(), $a->getMode(), $a->getConfig(), $a->getBasePath()); + $a = DI::app(); + $process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath()); $process->run($command, $args); // after spawning we have to remove the flag. - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { self::IPCSetJobState(false); } } /** - * @brief Adds tasks to the worker queue + * Adds tasks to the worker queue * * @param (integer|array) priority or parameter array, strings are deprecated and are ignored * @@ -1104,7 +1124,7 @@ class Worker * or: Worker::add(PRIORITY_HIGH, "Notifier", Delivery::DELETION, $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 + * @return boolean "false" if worker queue entry already existed or there had been an error * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @note $cmd and string args are surrounded with "" * @@ -1129,7 +1149,7 @@ class Worker $priority = PRIORITY_MEDIUM; // Don't fork from frontend tasks by default - $dont_fork = Config::get("system", "worker_dont_fork", false) || !\get_app()->getMode()->isBackend(); + $dont_fork = DI::config()->get("system", "worker_dont_fork", false) || !DI::mode()->isBackend(); $created = DateTimeFormat::utcNow(); $force_priority = false; @@ -1154,6 +1174,7 @@ class Worker $parameters = json_encode($args); $found = DBA::exists('workerqueue', ['parameter' => $parameters, 'done' => false]); + $added = false; // Quit if there was a database error - a precaution for the update process to 3.5.3 if (DBA::errorNo() != 0) { @@ -1161,39 +1182,42 @@ class Worker } if (!$found) { - DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); + $added = DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]); + if (!$added) { + return false; + } } elseif ($force_priority) { DBA::update('workerqueue', ['priority' => $priority], ['parameter' => $parameters, 'done' => false, 'pid' => 0]); } // Should we quit and wait for the worker to be called as a cronjob? if ($dont_fork) { - return true; + return $added; } // If there is a lock then we don't have to check for too much worker - if (!Lock::acquire('worker', 0)) { - return true; + if (!DI::lock()->acquire(self::LOCK_WORKER, 0)) { + return $added; } // If there are already enough workers running, don't fork another one $quit = self::tooMuchWorkers(); - Lock::release('worker'); + DI::lock()->release(self::LOCK_WORKER); if ($quit) { - return true; + return $added; } // We tell the daemon that a new job entry exists - if (Config::get('system', 'worker_daemon_mode', false)) { + if (DI::config()->get('system', 'worker_daemon_mode', false)) { // We don't have to set the IPC flag - this is done in "tooMuchWorkers" - return true; + return $added; } // Now call the worker to execute the jobs that we just added to the queue self::spawnWorker(); - return true; + return $added; } /** @@ -1224,21 +1248,22 @@ class Worker /** * Defers the current worker entry + * * @return boolean had the entry been deferred? */ public static function defer() { - if (empty(BaseObject::getApp()->queue)) { + if (empty(DI::app()->queue)) { return false; } - $queue = BaseObject::getApp()->queue; + $queue = DI::app()->queue; $retrial = $queue['retrial']; $id = $queue['id']; $priority = $queue['priority']; - $max_level = Config::get('system', 'worker_defer_limit'); + $max_level = DI::config()->get('system', 'worker_defer_limit'); $new_retrial = self::getNextRetrial($queue, $max_level); @@ -1272,8 +1297,6 @@ class Worker /** * Log active processes into the "process" table - * - * @brief Log active processes into the "process" table */ public static function startProcess() { @@ -1289,7 +1312,6 @@ class Worker /** * Remove the active process from the "process" table * - * @brief Remove the active process from the "process" table * @return bool * @throws \Exception */ @@ -1301,7 +1323,6 @@ class Worker /** * Set the flag if some job is waiting * - * @brief Set the flag if some job is waiting * @param boolean $jobs Is there a waiting job? * @throws \Exception */ @@ -1316,7 +1337,6 @@ class Worker /** * Checks if some worker job waits to be executed * - * @brief Checks if some worker job waits to be executed * @return bool * @throws \Exception */