diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -336,11 +336,7 @@ celery.always.eager = false 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.type = memo 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 #### #################################### diff --git a/docs/usage/performance.rst b/docs/usage/performance.rst --- a/docs/usage/performance.rst +++ b/docs/usage/performance.rst @@ -22,17 +22,8 @@ Follow these few steps to improve perfor 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 diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako --- a/kallithea/bin/template.ini.mako +++ b/kallithea/bin/template.ini.mako @@ -334,11 +334,7 @@ celery.always.eager = false 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.type = memo 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>### BEAKER SESSION #### <%text>#################################### diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl --- a/kallithea/config/deployment.ini_tmpl +++ b/kallithea/config/deployment.ini_tmpl @@ -330,11 +330,7 @@ celery.always.eager = false 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.type = memo 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 #### #################################### diff --git a/test.ini b/test.ini --- a/test.ini +++ b/test.ini @@ -336,11 +336,7 @@ celery.always.eager = false 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.type = memo 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 #### ####################################