Mercurial > kallithea
changeset 1034:9e59b16d1b48 beta
updated config files, and changed model repo_followers to followers
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 12 Feb 2011 16:21:02 +0100 |
| parents | e2ebbb27df4e |
| children | 59b7131c15b1 |
| files | production.ini rhodecode/config/deployment.ini_tmpl rhodecode/model/db.py |
| diffstat | 3 files changed, 36 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/production.ini Sat Feb 12 16:06:12 2011 +0100 +++ b/production.ini Sat Feb 12 16:21:02 2011 +0100 @@ -1,6 +1,6 @@ ################################################################################ ################################################################################ -# rhodecode - Pylons environment configuration # +# RhodeCode - Pylons environment configuration # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ @@ -10,7 +10,7 @@ ################################################################################ ## Uncomment and replace with the address which should receive ## ## any error reports after application crash ## -## Additionally those settings will be used by rhodecode mailing system ## +## Additionally those settings will be used by RhodeCode mailing system ## ################################################################################ #email_to = admin@localhost #error_email_from = paste_error@localhost @@ -78,8 +78,9 @@ #################################### ### BEAKER CACHE #### #################################### -beaker.cache.data_dir=/%(here)s/data/cache/data -beaker.cache.lock_dir=/%(here)s/data/cache/lock +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 @@ -93,7 +94,7 @@ beaker.cache.sql_cache_short.type=memory -beaker.cache.sql_cache_short.expire=5 +beaker.cache.sql_cache_short.expire=10 beaker.cache.sql_cache_med.type=memory beaker.cache.sql_cache_med.expire=360 @@ -147,7 +148,7 @@ ### LOGGING CONFIGURATION #### ################################ [loggers] -keys = root, routes, rhodecode, sqlalchemy +keys = root, routes, rhodecode, sqlalchemy,beaker,templates [handlers] keys = console @@ -169,6 +170,18 @@ # "level = DEBUG" logs the route matched and routing variables. propagate = 0 +[logger_beaker] +level = ERROR +handlers = console +qualname = beaker.container +propagate = 0 + +[logger_templates] +level = INFO +handlers = console +qualname = pylons.templating +propagate = 0 + [logger_rhodecode] level = DEBUG handlers = console
--- a/rhodecode/config/deployment.ini_tmpl Sat Feb 12 16:06:12 2011 +0100 +++ b/rhodecode/config/deployment.ini_tmpl Sat Feb 12 16:21:02 2011 +0100 @@ -79,8 +79,9 @@ #################################### ### BEAKER CACHE #### #################################### -beaker.cache.data_dir=/%(here)s/data/cache/data -beaker.cache.lock_dir=/%(here)s/data/cache/lock +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 @@ -147,7 +148,7 @@ ### LOGGING CONFIGURATION #### ################################ [loggers] -keys = root, routes, rhodecode, sqlalchemy +keys = root, routes, rhodecode, sqlalchemy,beaker,templates [handlers] keys = console @@ -169,6 +170,18 @@ # "level = DEBUG" logs the route matched and routing variables. propagate = 0 +[logger_beaker] +level = ERROR +handlers = console +qualname = beaker.container +propagate = 0 + +[logger_templates] +level = INFO +handlers = console +qualname = pylons.templating +propagate = 0 + [logger_rhodecode] level = DEBUG handlers = console
--- a/rhodecode/model/db.py Sat Feb 12 16:06:12 2011 +0100 +++ b/rhodecode/model/db.py Sat Feb 12 16:21:02 2011 +0100 @@ -205,7 +205,7 @@ users_group_to_perm = relationship('UsersGroupToPerm', cascade='all') stats = relationship('Statistics', cascade='all', uselist=False) - repo_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all') + followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all') logs = relationship('UserLog', cascade='all')