X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcronhooks.php;h=d5b4f3bf6f1b4f07974f409f44d987f809a86854;hb=83cb32d637b6a34d6ab654d6b202a1b18ad2a5ab;hp=26cab3cf92a86a0c3a2b566f3d24dc56ed7e356c;hpb=a37f31b82fa72a5da70fc459a457fd1d88c9b035;p=friendica.git diff --git a/include/cronhooks.php b/include/cronhooks.php index 26cab3cf92..d5b4f3bf6f 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -11,11 +11,11 @@ function cronhooks_run(&$argv, &$argc){ } if(is_null($db)) { - @include(".htconfig.php"); - require_once("include/dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); - }; + @include(".htconfig.php"); + require_once("include/dba.php"); + $db = new dba($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); + }; require_once('include/session.php'); require_once('include/datetime.php'); @@ -35,17 +35,31 @@ 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(); if ($lockpath != '') { $pidfile = new pidfile($lockpath, 'cronhooks'); if($pidfile->is_already_running()) { logger("cronhooks: Already running"); if ($pidfile->running_time() > 19*60) { - $pidfile->kill(); - logger("cronhooks: killed stale process"); + $pidfile->kill(); + logger("cronhooks: killed stale process"); // Calling a new instance proc_run('php','include/cronhooks.php'); - } + } exit; } } @@ -62,10 +76,12 @@ function cronhooks_run(&$argv, &$argc){ logger('cronhooks: end'); + set_config('system','last_cronhook', time()); + return; } if (array_search(__file__,get_included_files())===0){ - cronhooks_run($_SERVER["argv"],$_SERVER["argc"]); - killme(); + cronhooks_run($_SERVER["argv"],$_SERVER["argc"]); + killme(); }