Merge pull request #5172 from annando/develop
Bugfix: In the daemon mode we forgot to call the cron jobs
This commit is contained in:
commit
e1216e3a60
|
@ -126,16 +126,25 @@ file_put_contents($pidfile, $pid);
|
|||
|
||||
$wait_interval = intval(Config::get('system', 'cron_interval', 5)) * 60;
|
||||
|
||||
$do_cron = true;
|
||||
|
||||
// Now running as a daemon.
|
||||
while (true) {
|
||||
logger('Call the worker', LOGGER_DEBUG);
|
||||
Worker::spawnWorker();
|
||||
Worker::spawnWorker($do_cron);
|
||||
|
||||
logger("Sleep for $wait_interval seconds - or when a worker needs to be called", LOGGER_DEBUG);
|
||||
logger("Sleeping", LOGGER_DEBUG);
|
||||
$i = 0;
|
||||
do {
|
||||
sleep(1);
|
||||
} while (($i++ < $wait_interval) && !Worker::IPCJobsExists());
|
||||
|
||||
if ($i >= $wait_interval) {
|
||||
$do_cron = true;
|
||||
logger("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
|
||||
} else {
|
||||
$do_cron = false;
|
||||
logger("Worker jobs are calling to be forked.", LOGGER_DEBUG);
|
||||
}
|
||||
}
|
||||
|
||||
function shutdown() {
|
||||
|
|
|
@ -1015,9 +1015,14 @@ class Worker
|
|||
* @brief Spawns a new worker
|
||||
* @return void
|
||||
*/
|
||||
public static function spawnWorker()
|
||||
public static function spawnWorker($do_cron = false)
|
||||
{
|
||||
$args = ["bin/worker.php", "no_cron"];
|
||||
$args = ["bin/worker.php"];
|
||||
|
||||
if (!$do_cron) {
|
||||
$args[] = "no_cron";
|
||||
}
|
||||
|
||||
get_app()->proc_run($args);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user