diff --git a/configs/development.ini b/configs/development.ini --- a/configs/development.ini +++ b/configs/development.ini @@ -314,7 +314,7 @@ celery.task_always_eager = false ## Default cache dir for caches. Putting this into a ramdisk ## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require ## large ammount of space -cache_dir = /tmp/rcdev/data +cache_dir = %(here)s/data ## `cache_perms` cache settings for permission tree, auth TTL. rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace @@ -355,8 +355,8 @@ rc_cache.sql_cache_short.expiration_time rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru # by default we use 96H, this is using invalidation on push anyway rc_cache.cache_repo_longterm.expiration_time = 345600 -# max items in LRU cache, reduce this number to save memory, and expire last used -# cached objects +## max items in LRU cache, reduce this number to save memory, and expire last used +## cached objects rc_cache.cache_repo_longterm.max_size = 10000 @@ -728,5 +728,5 @@ datefmt = %Y-%m-%d %H:%M:%S [formatter_color_formatter_sql] class = rhodecode.lib.logging_formatter.ColorFormatterSql -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s +format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s datefmt = %Y-%m-%d %H:%M:%S diff --git a/configs/production.ini b/configs/production.ini --- a/configs/production.ini +++ b/configs/production.ini @@ -288,8 +288,8 @@ celery.task_always_eager = false ##################################### ## Default cache dir for caches. Putting this into a ramdisk ## can boost performance, eg. /tmpfs/data_ramdisk, however this directory might require -## large ammount of space -cache_dir = /%(here)s/rcdev/data +## large amount of space +cache_dir = %(here)s/data ## `cache_perms` cache settings for permission tree, auth TTL. rc_cache.cache_perms.backend = dogpile.cache.rc.file_namespace @@ -328,10 +328,10 @@ rc_cache.sql_cache_short.expiration_time ## `cache_repo_longterm` cache for repo object instances, this needs to use memory ## type backend as the objects kept are not pickle serializable rc_cache.cache_repo_longterm.backend = dogpile.cache.rc.memory_lru -# by default we use 96H, this is using invalidation on push anyway +## by default we use 96H, this is using invalidation on push anyway rc_cache.cache_repo_longterm.expiration_time = 345600 -# max items in LRU cache, reduce this number to save memory, and expire last used -# cached objects +## max items in LRU cache, reduce this number to save memory, and expire last used +## cached objects rc_cache.cache_repo_longterm.max_size = 10000 @@ -524,7 +524,6 @@ vcs.server.protocol = http ## Push/Pull operations protocol, available options are: ## `http` - use http-rpc backend (default) -## vcs.scm_app_implementation = http ## Push/Pull operations hooks protocol, available options are: @@ -535,7 +534,7 @@ vcs.hooks.protocol = http vcs.hooks.host = 127.0.0.1 vcs.server.log_level = info -## Start VCSServer with this instance as a subprocess, usefull for development +## Start VCSServer with this instance as a subprocess, useful for development vcs.start_server = false ## List of enabled VCS backends, available options are: @@ -698,5 +697,5 @@ datefmt = %Y-%m-%d %H:%M:%S [formatter_color_formatter_sql] class = rhodecode.lib.logging_formatter.ColorFormatterSql -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s +format = %(asctime)s.%(msecs)03d [%(process)d] %(levelname)-5.5s [%(name)s] %(message)s datefmt = %Y-%m-%d %H:%M:%S