unset($db_host, $db_user, $db_pass, $db_data);
};
- // run queue delivery process in the background
-
- proc_run('php',"include/queue.php");
-
- // run diaspora photo queue process in the background
-
- proc_run('php',"include/dsprphotoq.php");
-
- // run the process to discover global contacts in the background
-
- proc_run('php',"include/discover_poco.php");
+ if(function_exists('sys_getloadavg')) {
+ $maxsysload = intval(get_config('system','maxloadavg'));
+ if($maxsysload < 1)
+ $maxsysload = 50;
+
+ $load = sys_getloadavg();
+ if(intval($load[0]) > $maxsysload) {
+ logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+ return;
+ }
+ }
- // run the process to update locally stored global contacts in the background
+ if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+ // Run the cron job that calls all other jobs
+ proc_run("php","include/cron.php");
- proc_run('php',"include/discover_poco.php", "checkcontact");
+ // Run the cronhooks job separately from cron for being able to use a different timing
+ proc_run("php","include/cronhooks.php");
- // When everything else is done ...
- proc_run("php","include/cron.php");
+ // Cleaning dead processes
+ $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+ foreach($r AS $pid)
+ if (!posix_kill($pid["pid"], 0))
+ q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+ intval($pid["pid"]));
+ else {
+ // To-Do: Kill long running processes
+ // But: Update processes (like the database update) mustn't be killed
+ }
- // Cleaning killed processes
- $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
- foreach($r AS $pid)
- if (!posix_kill($pid["pid"], 0))
- q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
- intval($pid["pid"]));
+ } else
+ // Sleep two seconds before checking for running processes to avoid having too many workers
+ sleep(4);
// Checking number of workers
- $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-
- $queues = intval(get_config("system", "worker_queues"));
-
- if ($queues == 0)
- $queues = 4;
-
- if ($workers[0]["workers"] >= $queues)
+ if (poller_too_much_workers())
return;
+ $starttime = time();
+
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
- q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
+
+ q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
dbesc(datetime_convert()),
intval(getmypid()),
intval($r[0]["id"]));
+ // Assure that there are no tasks executed twice
+ $id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
+ intval($r[0]["id"]),
+ intval(getmypid()));
+ if (!$id) {
+ logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
+ continue;
+ }
+
$argv = json_decode($r[0]["parameter"]);
$argc = count($argv);
- // To-Do: Check for existance
- require_once(basename($argv[0]));
+ // Check for existance and validity of the include file
+ $include = $argv[0];
+
+ if (!validate_include($include)) {
+ logger("Include file ".$argv[0]." is not valid!");
+ q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+ continue;
+ }
+
+ require_once($include);
$funcname=str_replace(".php", "", basename($argv[0]))."_run";
if (function_exists($funcname)) {
logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
$funcname($argv, $argc);
- //sleep(10);
+
logger("Process ".getmypid().": ".$funcname." - done");
q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
- }
+ } else
+ logger("Function ".$funcname." does not exist");
+
+ // Quit the poller once every hour
+ if (time() > ($starttime + 3600))
+ return;
+
+ // Count active workers and compare them with a maximum value that depends on the load
+ if (poller_too_much_workers())
+ return;
+ }
+
+}
+
+function poller_too_much_workers() {
+
+ $queues = get_config("system", "worker_queues");
+
+ if ($queues == 0)
+ $queues = 4;
+
+ $active = poller_active_workers();
+
+ // Decrease the number of workers at higher load
+ if(function_exists('sys_getloadavg')) {
+ $load = max(sys_getloadavg());
+
+ $maxsysload = intval(get_config('system','maxloadavg'));
+ if($maxsysload < 1)
+ $maxsysload = 50;
+
+ $maxworkers = $queues;
+
+ // Some magical mathemathics to reduce the workers
+ $exponent = 3;
+ $slope = $maxworkers / pow($maxsysload, $exponent);
+ $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
+
+ logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG);
+
}
+ return($active >= $queues);
+}
+
+function poller_active_workers() {
+ $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+ return($workers[0]["workers"]);
}
if (array_search(__file__,get_included_files())===0){
projects / friendica.git / blobdiff