aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-11-26 23:54:19 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-11-26 23:54:19 +0000
commitce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8 (patch)
tree18f8894a07bf82098381d8ebf2411a74f740a8d0
parentac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0 (diff)
downloadforums-ce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8.tar
forums-ce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8.tar.gz
forums-ce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8.tar.bz2
forums-ce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8.tar.xz
forums-ce8fddf78fe0a446f8cecc515ae9ce5fc6e09ab8.zip
ACM garbage collection
git-svn-id: file:///svn/phpbb/trunk@4685 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/common.php8
-rw-r--r--phpBB/install/schemas/schema_data.sql2
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index d3c912df4b..3bda138d6b 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -250,12 +250,12 @@ else
unset($cached_config);
}
-/*
-if (time() - $config['cache_interval'] >= $config['cache_last_gc'])
+// Tidy the cache
+if (method_exists($cache, 'tidy') && time() - $config['cache_gc'] > $config['cache_last_gc'])
{
- $cache->tidy($config['cache_gc']);
+ $cache->tidy();
+ set_config('cache_last_gc', time(), TRUE);
}
-*/
// Adjust storage path's
$config['upload_dir'] = ($config['upload_dir']{0} == '/' || ($config['upload_dir']{0} != '/' && $config['upload_dir']{1} == ':')) ? $config['upload_dir'] : $phpbb_root_path . $config['upload_dir'];
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index bef113dd44..6b368545cf 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -73,6 +73,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '4');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1');
@@ -165,6 +166,7 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_fi
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('session_last_gc', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('search_last_gc', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('last_queue_run', '0', 1);
# -- auth options