changeset 5399:4610a39d3be9

cleanup: kill unused beaker cache regions
author Mads Kiilerich <madski@unity3d.com>
date Mon, 17 Aug 2015 01:11:42 +0200
parents 956c557749cf
children 6257de126ec7
files development.ini docs/usage/performance.rst kallithea/bin/template.ini.mako kallithea/config/deployment.ini_tmpl test.ini
diffstat 5 files changed, 6 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/development.ini	Mon Aug 17 01:11:42 2015 +0200
+++ b/development.ini	Mon Aug 17 01:11:42 2015 +0200
@@ -336,11 +336,7 @@
 beaker.cache.data_dir = %(here)s/data/cache/data
 beaker.cache.lock_dir = %(here)s/data/cache/lock
 
-beaker.cache.regions = super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
-
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+beaker.cache.regions = short_term,long_term,sql_cache_short
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
@@ -354,14 +350,6 @@
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-beaker.cache.sql_cache_med.type = memory
-beaker.cache.sql_cache_med.expire = 360
-beaker.cache.sql_cache_med.key_length = 256
-
-beaker.cache.sql_cache_long.type = file
-beaker.cache.sql_cache_long.expire = 3600
-beaker.cache.sql_cache_long.key_length = 256
-
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
--- a/docs/usage/performance.rst	Mon Aug 17 01:11:42 2015 +0200
+++ b/docs/usage/performance.rst	Mon Aug 17 01:11:42 2015 +0200
@@ -22,17 +22,8 @@
 
 1. Increase cache
 
-    In the .ini file::
-
-     beaker.cache.sql_cache_long.expire=3600 <-- set this to higher number
-
-    This option affects the cache expiration time for the main
-    page. Having several hundreds of repositories on main page can
-    sometimes make the system behave slowly when the cache expires for
-    all of them. Increasing the ``expire`` option to a day (86400) or a
-    week (604800) will improve general response times for the main
-    page. Kallithea has an intelligent cache expiration system and it
-    will expire the cache for repositories that have been changed.
+    Tweak beaker cache settings in the ini file. That actual effect of that
+    is questionable.
 
 2. Switch from sqlite to postgres or mysql
 
--- a/kallithea/bin/template.ini.mako	Mon Aug 17 01:11:42 2015 +0200
+++ b/kallithea/bin/template.ini.mako	Mon Aug 17 01:11:42 2015 +0200
@@ -334,11 +334,7 @@
 beaker.cache.data_dir = ${here}/data/cache/data
 beaker.cache.lock_dir = ${here}/data/cache/lock
 
-beaker.cache.regions = super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
-
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+beaker.cache.regions = short_term,long_term,sql_cache_short
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
@@ -352,14 +348,6 @@
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-beaker.cache.sql_cache_med.type = memory
-beaker.cache.sql_cache_med.expire = 360
-beaker.cache.sql_cache_med.key_length = 256
-
-beaker.cache.sql_cache_long.type = file
-beaker.cache.sql_cache_long.expire = 3600
-beaker.cache.sql_cache_long.key_length = 256
-
 <%text>####################################</%text>
 <%text>###       BEAKER SESSION        ####</%text>
 <%text>####################################</%text>
--- a/kallithea/config/deployment.ini_tmpl	Mon Aug 17 01:11:42 2015 +0200
+++ b/kallithea/config/deployment.ini_tmpl	Mon Aug 17 01:11:42 2015 +0200
@@ -330,11 +330,7 @@
 beaker.cache.data_dir = %(here)s/data/cache/data
 beaker.cache.lock_dir = %(here)s/data/cache/lock
 
-beaker.cache.regions = super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
-
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+beaker.cache.regions = short_term,long_term,sql_cache_short
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
@@ -348,14 +344,6 @@
 beaker.cache.sql_cache_short.expire = 10
 beaker.cache.sql_cache_short.key_length = 256
 
-beaker.cache.sql_cache_med.type = memory
-beaker.cache.sql_cache_med.expire = 360
-beaker.cache.sql_cache_med.key_length = 256
-
-beaker.cache.sql_cache_long.type = file
-beaker.cache.sql_cache_long.expire = 3600
-beaker.cache.sql_cache_long.key_length = 256
-
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
--- a/test.ini	Mon Aug 17 01:11:42 2015 +0200
+++ b/test.ini	Mon Aug 17 01:11:42 2015 +0200
@@ -336,11 +336,7 @@
 beaker.cache.data_dir = %(here)s/data/cache/data
 beaker.cache.lock_dir = %(here)s/data/cache/lock
 
-beaker.cache.regions = super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
-
-beaker.cache.super_short_term.type = memory
-beaker.cache.super_short_term.expire = 10
-beaker.cache.super_short_term.key_length = 256
+beaker.cache.regions = short_term,long_term,sql_cache_short
 
 beaker.cache.short_term.type = memory
 beaker.cache.short_term.expire = 60
@@ -354,14 +350,6 @@
 beaker.cache.sql_cache_short.expire = 1
 beaker.cache.sql_cache_short.key_length = 256
 
-beaker.cache.sql_cache_med.type = memory
-beaker.cache.sql_cache_med.expire = 360
-beaker.cache.sql_cache_med.key_length = 256
-
-beaker.cache.sql_cache_long.type = file
-beaker.cache.sql_cache_long.expire = 3600
-beaker.cache.sql_cache_long.key_length = 256
-
 ####################################
 ###       BEAKER SESSION        ####
 ####################################