# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-02-12 16:21:02
# Node ID 9e59b16d1b480d67e229200aac0027870735d011
# Parent  e2ebbb27df4e11c5ccb5d6f4e0aa5cd8e0d4a7fc

updated config files, and changed model repo_followers to followers

diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -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 @@ debug = true
 ################################################################################
 ## 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 @@ celery.always.eager = false
 ####################################
 ###         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.long_term.expire=36000
 
 
 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 @@ sqlalchemy.convert_unicode = true
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy
+keys = root, routes, rhodecode, sqlalchemy,beaker,templates
 
 [handlers]
 keys = console
@@ -169,6 +170,18 @@ qualname = routes.middleware
 # "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
diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl
--- a/rhodecode/config/deployment.ini_tmpl
+++ b/rhodecode/config/deployment.ini_tmpl
@@ -79,8 +79,9 @@ celery.always.eager = false
 ####################################
 ###         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 @@ sqlalchemy.convert_unicode = true
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy
+keys = root, routes, rhodecode, sqlalchemy,beaker,templates
 
 [handlers]
 keys = console
@@ -169,6 +170,18 @@ qualname = routes.middleware
 # "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
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -205,7 +205,7 @@ class Repository(Base, BaseModel):
     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')