clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The worker can now call methods in the worker namespace

This commit is contained in:
Michael 2017-11-12 07:21:23 +00:00
parent be13332807
commit 06ce34eda1
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Core/Worker.php
View File

@ -211,6 +211,34 @@ class Worker {
// Check for existance and validity of the include file
$include = $argv[0];
if (method_exists(sprintf('Friendica\Worker\%s', $include), 'execute')) {
// We constantly update the "executed" date every minute to avoid being killed too soon
if (!isset(self::$last_update)) {
self::$last_update = strtotime($queue["executed"]);
}
$age = (time() - self::$last_update) / 60;
self::$last_update = time();
if ($age > 1) {
$stamp = (float)microtime(true);
dba::update('workerqueue', array('executed' => datetime_convert()), array('pid' => $mypid, 'done' => false));
self::$db_duration += (microtime(true) - $stamp);
}
array_shift($argv);
self::execFunction($queue, $include, $argv, true);
$stamp = (float)microtime(true);
if (dba::update('workerqueue', array('done' => true), array('id' => $queue["id"]))) {
Config::set('system', 'last_poller_execution', datetime_convert());
}
self::$db_duration = (microtime(true) - $stamp);
return true;
}
// The script could be provided as full path or only with the function name
if ($include == basename($include)) {
$include = "include/".$include.".php";
@ -242,7 +270,7 @@ class Worker {
self::$db_duration += (microtime(true) - $stamp);
}
self::execFunction($queue, $funcname, $argv);
self::execFunction($queue, $funcname, $argv, false);
$stamp = (float)microtime(true);
if (dba::update('workerqueue', array('done' => true), array('id' => $queue["id"]))) {
@ -264,7 +292,7 @@ class Worker {
* @param string $funcname name of the function
* @param array $argv Array of values to be passed to the function
*/
private static function execFunction($queue, $funcname, $argv) {
private static function execFunction($queue, $funcname, $argv, $method_call) {
$a = get_app();
$mypid = getmypid();
@ -303,7 +331,11 @@ class Worker {
// Reset global data to avoid interferences
unset($_SESSION);
$funcname($argv, $argc);
if ($method_call) {
call_user_func_array(sprintf('Friendica\Worker\%s::execute', $funcname), $argv);
} else {
$funcname($argv, $argc);
}
$a->process_id = $old_process_id;
unset($a->queue);
@ -873,7 +905,7 @@ class Worker {
self::add(PRIORITY_MEDIUM, "cron");
// Run the cronhooks job separately from cron for being able to use a different timing
self::add(PRIORITY_MEDIUM, "cronhooks");
self::add(PRIORITY_MEDIUM, "CronHooks");
// Cleaning dead processes
self::killStaleWorkers();