caches: don't use beaker for file caches anymore

This commit is contained in:
Marcin Kuzminski 2018-07-06 12:55:13 +02:00
parent ddc445856e
commit a48ab8a32d
15 changed files with 245 additions and 201 deletions

View file

@ -308,47 +308,72 @@ celery.max_tasks_per_child = 100
## tasks will never be sent to the queue, but executed locally instead.
celery.task_always_eager = false
#####################################
### DOGPILE CACHE ####
#####################################
## Default cache dir for caches. Putting this into a ramdisk
## can boost performance, eg. /tmpfs/data_ramdisk, however this might require lots
## of space
cache_dir = /tmp/rcdev/data
## cache settings for permission tree, auth TTL.
rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace
rc_cache.cache_perms.expiration_time = 300
rc_cache.cache_perms.arguments.filename = /tmp/rc_cache_1
## redis backend with distributed locks
#rc_cache.cache_perms.backend = dogpile.cache.rc.redis
#rc_cache.cache_perms.expiration_time = 300
#rc_cache.cache_perms.arguments.host = localhost
#rc_cache.cache_perms.arguments.port = 6379
#rc_cache.cache_perms.arguments.db = 0
#rc_cache.cache_perms.arguments.redis_expiration_time = 7200
#rc_cache.cache_perms.arguments.distributed_lock = true
rc_cache.cache_repo.backend = dogpile.cache.rc.file_namespace
rc_cache.cache_repo.expiration_time = 2592000
rc_cache.cache_repo.arguments.filename = /tmp/rc_cache_2
## redis backend with distributed locks
#rc_cache.cache_repo.backend = dogpile.cache.rc.redis
#rc_cache.cache_repo.expiration_time = 2592000
## this needs to be greater then expiration_time
#rc_cache.cache_repo.arguments.redis_expiration_time = 2678400
#rc_cache.cache_repo.arguments.host = localhost
#rc_cache.cache_repo.arguments.port = 6379
#rc_cache.cache_repo.arguments.db = 1
#rc_cache.cache_repo.arguments.distributed_lock = true
####################################
### BEAKER CACHE ####
####################################
# default cache dir for templates. Putting this into a ramdisk
## can boost performance, eg. %(here)s/data_ramdisk
cache_dir = %(here)s/data
## locking and default file storage for Beaker. Putting this into a ramdisk
## can boost performance, eg. %(here)s/data_ramdisk/cache/beaker_data
beaker.cache.data_dir = %(here)s/data/cache/beaker_data
beaker.cache.lock_dir = %(here)s/data/cache/beaker_lock
beaker.cache.regions = long_term, sql_cache_short, repo_cache_long
beaker.cache.regions = long_term, sql_cache_short
beaker.cache.long_term.type = memory
beaker.cache.long_term.expire = 36000
beaker.cache.long_term.type = memorylru_base
beaker.cache.long_term.expire = 172800
beaker.cache.long_term.key_length = 256
beaker.cache.sql_cache_short.type = memory
beaker.cache.sql_cache_short.type = memorylru_base
beaker.cache.sql_cache_short.expire = 10
beaker.cache.sql_cache_short.key_length = 256
beaker.cache.repo_cache_long.type = memorylru_base
beaker.cache.repo_cache_long.max_items = 4096
beaker.cache.repo_cache_long.expire = 2592000
## default is memorylru_base cache, configure only if required
## using multi-node or multi-worker setup
#beaker.cache.repo_cache_long.type = ext:memcached
#beaker.cache.repo_cache_long.url = localhost:11211
#beaker.cache.repo_cache_long.expire = 1209600
#beaker.cache.repo_cache_long.key_length = 256
####################################
### BEAKER SESSION ####
####################################
## .session.type is type of storage options for the session, current allowed
## types are file, ext:memcached, ext:database, and memory (default).
## types are file, ext:memcached, ext:redis, ext:database, and memory (default).
beaker.session.type = file
beaker.session.data_dir = %(here)s/data/sessions/data
beaker.session.data_dir = %(here)s/data/sessions
## db based session, fast, and allows easy management over logged in users
#beaker.session.type = ext:database
@ -496,6 +521,8 @@ debug_style = true
#sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
#sqlalchemy.db1.url = postgresql://postgres:qweqwe@localhost/rhodecode
#sqlalchemy.db1.url = mysql://root:qweqwe@localhost/rhodecode
#sqlalchemy.db1.url = mysql+pymysql://root:qweqwe@localhost/rhodecode
sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db?timeout=30
# see sqlalchemy docs for other advanced settings
@ -515,6 +542,9 @@ sqlalchemy.db1.convert_unicode = true
## which defaults to five.
#sqlalchemy.db1.max_overflow = 10
## Connection check ping, used to detect broken database connections
## could be enabled to better handle cases if MySQL has gone away errors
#sqlalchemy.db1.ping_connection = true
##################
### VCS CONFIG ###
@ -624,7 +654,7 @@ custom.conf = 1
### LOGGING CONFIGURATION ####
################################
[loggers]
keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper, celery
keys = root, sqlalchemy, beaker, celery, rhodecode, ssh_wrapper
[handlers]
keys = console, console_sql
@ -680,9 +710,12 @@ level = DEBUG
formatter = color_formatter
[handler_console_sql]
# "level = DEBUG" logs SQL queries and results.
# "level = INFO" logs SQL queries.
# "level = WARN" logs neither. (Recommended for production systems.)
class = StreamHandler
args = (sys.stderr, )
level = DEBUG
level = WARN
formatter = color_formatter_sql
################