bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Let the cronhook be called different from the cron job.

Browse source
This commit is contained in:
Michael Vogel 2015-09-12 20:22:58 +02:00
parent 7edce8e266
commit 12659fc3a1
3 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cron.php
View file

@ -225,9 +225,6 @@ function cron_run(&$argv, &$argc){
$d = datetime_convert(); $d = datetime_convert();
if(! $restart)
proc_run('php','include/cronhooks.php');
// Only poll from those with suitable relationships, // Only poll from those with suitable relationships,
// and which have a polling address and ignore Diaspora since // and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates. // we are unable to match those posts with a Diaspora GUID and prevent duplicates.

16
include/cronhooks.php
View file

@ -35,6 +35,20 @@ function cronhooks_run(&$argv, &$argc){
} }
} }
$last = get_config('system','last_cronhook');
$poll_interval = intval(get_config('system','cronhook_interval'));
if(! $poll_interval)
$poll_interval = 9;
if($last) {
$next = $last + ($poll_interval * 60);
if($next > time()) {
logger('cronhook intervall not reached');
return;
}
}
$lockpath = get_lockpath(); $lockpath = get_lockpath();
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'cronhooks'); $pidfile = new pidfile($lockpath, 'cronhooks');
@ -62,6 +76,8 @@ function cronhooks_run(&$argv, &$argc){
logger('cronhooks: end'); logger('cronhooks: end');
set_config('system','last_cronhook', time());
return; return;
} }

3
include/poller.php
View file

@ -30,6 +30,9 @@ function poller_run(&$argv, &$argc){
// Run the cron job that calls all other jobs // Run the cron job that calls all other jobs
proc_run("php","include/cron.php"); proc_run("php","include/cron.php");
// Run the cronhooks job separately from cron for being able to use a different timing
proc_run("php","include/cronhooks.php");
// Cleaning dead processes // Cleaning dead processes
$r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'"); $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
foreach($r AS $pid) foreach($r AS $pid)