From df5366a5ca0dd9ee93cbf21a61a78ffcbe66dc82 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 27 Oct 2014 15:42:26 -0700 Subject: [ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks PHPBB3-13232 --- phpBB/includes/functions.php | 4 ++-- phpBB/phpbb/cron/manager.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'phpBB') 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()) -- cgit v1.2.1 From 0cdd071230120b8d502e6869c17f5b748d9182a0 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 27 Oct 2014 15:45:24 -0700 Subject: [ticket/13232] Fix indentation PHPBB3-13232 --- phpBB/phpbb/cron/manager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/cron/manager.php b/phpBB/phpbb/cron/manager.php index df9bed4bd7..079ce8107e 100644 --- a/phpBB/phpbb/cron/manager.php +++ b/phpBB/phpbb/cron/manager.php @@ -72,8 +72,8 @@ class manager * @return \phpbb\cron\task\wrapper|null */ public function find_one_ready_task() - { - shuffle($this->tasks); + { + shuffle($this->tasks); foreach ($this->tasks as $task) { if ($task->is_ready()) -- cgit v1.2.1 From 6380aea647c2d611a4c3aaf5d0fe4046782340dd Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 28 Oct 2014 00:34:51 +0100 Subject: [ticket/13232] Fix more issues with TTL and global cache file PHPBB3-13232 --- phpBB/phpbb/avatar/driver/local.php | 4 ++-- phpBB/phpbb/version_helper.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB') diff --git a/phpBB/phpbb/avatar/driver/local.php b/phpBB/phpbb/avatar/driver/local.php index 07b3ed59de..8888686b2d 100644 --- a/phpBB/phpbb/avatar/driver/local.php +++ b/phpBB/phpbb/avatar/driver/local.php @@ -154,7 +154,7 @@ class local extends \phpbb\avatar\driver\driver */ protected function get_avatar_list($user) { - $avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list'); + $avatar_list = ($this->cache == null) ? false : $this->cache->get('_avatar_local_list'); if ($avatar_list === false) { @@ -192,7 +192,7 @@ class local extends \phpbb\avatar\driver\driver if ($this->cache != null) { - $this->cache->put('avatar_local_list', $avatar_list, 86400); + $this->cache->put('_avatar_local_list', $avatar_list, 86400); } } diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 968a57428f..96386f6d04 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -239,7 +239,7 @@ class version_helper */ public function get_versions($force_update = false, $force_cache = false) { - $cache_file = 'versioncheck_' . $this->host . $this->path . $this->file; + $cache_file = '_versioncheck_' . $this->host . $this->path . $this->file; $info = $this->cache->get($cache_file); -- cgit v1.2.1