##// END OF EJS Templates
updated config files, and changed model repo_followers to followers
marcink -
r1034:9e59b16d beta
parent child Browse files
Show More
@@ -1,6 +1,6 b''
1 ################################################################################
1 ################################################################################
2 ################################################################################
2 ################################################################################
3 # rhodecode - Pylons environment configuration #
3 # RhodeCode - Pylons environment configuration #
4 # #
4 # #
5 # The %(here)s variable will be replaced with the parent directory of this file#
5 # The %(here)s variable will be replaced with the parent directory of this file#
6 ################################################################################
6 ################################################################################
@@ -10,7 +10,7 b' debug = true'
10 ################################################################################
10 ################################################################################
11 ## Uncomment and replace with the address which should receive ##
11 ## Uncomment and replace with the address which should receive ##
12 ## any error reports after application crash ##
12 ## any error reports after application crash ##
13 ## Additionally those settings will be used by rhodecode mailing system ##
13 ## Additionally those settings will be used by RhodeCode mailing system ##
14 ################################################################################
14 ################################################################################
15 #email_to = admin@localhost
15 #email_to = admin@localhost
16 #error_email_from = paste_error@localhost
16 #error_email_from = paste_error@localhost
@@ -78,8 +78,9 b' celery.always.eager = false'
78 ####################################
78 ####################################
79 ### BEAKER CACHE ####
79 ### BEAKER CACHE ####
80 ####################################
80 ####################################
81 beaker.cache.data_dir=/%(here)s/data/cache/data
81 beaker.cache.data_dir=%(here)s/data/cache/data
82 beaker.cache.lock_dir=/%(here)s/data/cache/lock
82 beaker.cache.lock_dir=%(here)s/data/cache/lock
83
83 beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
84 beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
84
85
85 beaker.cache.super_short_term.type=memory
86 beaker.cache.super_short_term.type=memory
@@ -93,7 +94,7 b' beaker.cache.long_term.expire=36000'
93
94
94
95
95 beaker.cache.sql_cache_short.type=memory
96 beaker.cache.sql_cache_short.type=memory
96 beaker.cache.sql_cache_short.expire=5
97 beaker.cache.sql_cache_short.expire=10
97
98
98 beaker.cache.sql_cache_med.type=memory
99 beaker.cache.sql_cache_med.type=memory
99 beaker.cache.sql_cache_med.expire=360
100 beaker.cache.sql_cache_med.expire=360
@@ -147,7 +148,7 b' sqlalchemy.convert_unicode = true'
147 ### LOGGING CONFIGURATION ####
148 ### LOGGING CONFIGURATION ####
148 ################################
149 ################################
149 [loggers]
150 [loggers]
150 keys = root, routes, rhodecode, sqlalchemy
151 keys = root, routes, rhodecode, sqlalchemy,beaker,templates
151
152
152 [handlers]
153 [handlers]
153 keys = console
154 keys = console
@@ -169,6 +170,18 b' qualname = routes.middleware'
169 # "level = DEBUG" logs the route matched and routing variables.
170 # "level = DEBUG" logs the route matched and routing variables.
170 propagate = 0
171 propagate = 0
171
172
173 [logger_beaker]
174 level = ERROR
175 handlers = console
176 qualname = beaker.container
177 propagate = 0
178
179 [logger_templates]
180 level = INFO
181 handlers = console
182 qualname = pylons.templating
183 propagate = 0
184
172 [logger_rhodecode]
185 [logger_rhodecode]
173 level = DEBUG
186 level = DEBUG
174 handlers = console
187 handlers = console
@@ -79,8 +79,9 b' celery.always.eager = false'
79 ####################################
79 ####################################
80 ### BEAKER CACHE ####
80 ### BEAKER CACHE ####
81 ####################################
81 ####################################
82 beaker.cache.data_dir=/%(here)s/data/cache/data
82 beaker.cache.data_dir=%(here)s/data/cache/data
83 beaker.cache.lock_dir=/%(here)s/data/cache/lock
83 beaker.cache.lock_dir=%(here)s/data/cache/lock
84
84 beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
85 beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
85
86
86 beaker.cache.super_short_term.type=memory
87 beaker.cache.super_short_term.type=memory
@@ -147,7 +148,7 b' sqlalchemy.convert_unicode = true'
147 ### LOGGING CONFIGURATION ####
148 ### LOGGING CONFIGURATION ####
148 ################################
149 ################################
149 [loggers]
150 [loggers]
150 keys = root, routes, rhodecode, sqlalchemy
151 keys = root, routes, rhodecode, sqlalchemy,beaker,templates
151
152
152 [handlers]
153 [handlers]
153 keys = console
154 keys = console
@@ -169,6 +170,18 b' qualname = routes.middleware'
169 # "level = DEBUG" logs the route matched and routing variables.
170 # "level = DEBUG" logs the route matched and routing variables.
170 propagate = 0
171 propagate = 0
171
172
173 [logger_beaker]
174 level = ERROR
175 handlers = console
176 qualname = beaker.container
177 propagate = 0
178
179 [logger_templates]
180 level = INFO
181 handlers = console
182 qualname = pylons.templating
183 propagate = 0
184
172 [logger_rhodecode]
185 [logger_rhodecode]
173 level = DEBUG
186 level = DEBUG
174 handlers = console
187 handlers = console
@@ -205,7 +205,7 b' class Repository(Base, BaseModel):'
205 users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
205 users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
206 stats = relationship('Statistics', cascade='all', uselist=False)
206 stats = relationship('Statistics', cascade='all', uselist=False)
207
207
208 repo_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
208 followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
209
209
210 logs = relationship('UserLog', cascade='all')
210 logs = relationship('UserLog', cascade='all')
211
211
General Comments 0
You need to be logged in to leave comments. Login now