diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 15:42:26 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 15:42:26 -0700 |
| commit | df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82 (patch) | |
| tree | 3de8745b630a808ca1de86cf01bc3ee7f755f035 | |
| parent | d693d91e26e3200916b0f7fd475de1e968a43fee (diff) | |
| download | forums-df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82.tar forums-df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82.tar.gz forums-df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82.tar.bz2 forums-df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82.tar.xz forums-df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82.zip | |
[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks
PHPBB3-13232
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/cron/manager.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7700dcfd27..1a3560dbb1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5254,7 +5254,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = // Call cron-type script $call_cron = false; - if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('cron.lock_check')) + if (!defined('IN_CRON') && !$config['use_system_cron'] && $run_cron && !$config['board_disable'] && !$user->data['is_bot'] && !$cache->get('_cron.lock_check')) { $call_cron = true; $time_now = (!empty($user->time_now) && is_int($user->time_now)) ? $user->time_now : time(); @@ -5286,7 +5286,7 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler = } else { - $cache->put('cron.lock_check', true, 300); + $cache->put('_cron.lock_check', true, 60); } } diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index 5c8ac04b77..df9bed4bd7 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -72,7 +72,8 @@ class manager * @return \phpbb\cron\task\wrapper|null */ public function find_one_ready_task() - { + { + shuffle($this->tasks); foreach ($this->tasks as $task) { if ($task->is_ready()) |