Mercurial > kallithea
changeset 592:0a48c1ec04fc
#37 fixed json imports for python2.5
removed cache manager settings out of meta to ini files
docs update.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 12 Oct 2010 22:25:25 +0200 |
| parents | 1e2adb37cab6 |
| children | 4d6d860c7a05 |
| files | development.ini docs/changelog.rst docs/setup.rst production.ini rhodecode/__init__.py rhodecode/config/deployment.ini_tmpl rhodecode/controllers/changelog.py rhodecode/controllers/summary.py rhodecode/model/meta.py setup.cfg |
| diffstat | 10 files changed, 101 insertions(+), 85 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Mon Oct 11 19:18:05 2010 +0200 +++ b/development.ini Tue Oct 12 22:25:25 2010 +0200 @@ -47,15 +47,26 @@ #################################### ### BEAKER CACHE #### #################################### -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 -beaker.cache.long_term.type=memory -beaker.cache.long_term.expire=36000 -beaker.cache.short_term.type=memory -beaker.cache.short_term.expire=60 -beaker.cache.super_short_term.type=memory -beaker.cache.super_short_term.expire=10 + 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.long_term.type=memory + beaker.cache.long_term.expire=36000 + + beaker.cache.short_term.type=memory + beaker.cache.short_term.expire=60 + + beaker.cache.super_short_term.type=memory + beaker.cache.super_short_term.expire=10 + + beaker.cache.sql_cache_short.type=memory + beaker.cache.sql_cache_short.expire=5 + + beaker.cache.sql_cache_med.type=memory + beaker.cache.sql_cache_med.expire=360 + + beaker.cache.sql_cache_long.type=file + beaker.cache.sql_cache_long.expire=3600 #################################### ### BEAKER SESSION ####
--- a/docs/changelog.rst Mon Oct 11 19:18:05 2010 +0200 +++ b/docs/changelog.rst Tue Oct 12 22:25:25 2010 +0200 @@ -3,12 +3,17 @@ Changelog ========= +1.0.0rc4 (**2010-10-12**) -1.0.0rc3 (**tip**) +- fixed python2.5 missing simplejson imports (thanks to Jens Bäckman) +- removed cache_manager settings from sqlalchemy meta +- added sqlalchemy cache settings to ini files + +1.0.0rc3 (**2010-10-11**) - fixed i18n during installation. -1.0.0rc2 (**tip**) +1.0.0rc2 (**2010-10-11**) - Disabled dirsize in file browser, it's causing nasty bug when dir renames occure. After vcs is fixed it'll be put back again.
--- a/docs/setup.rst Mon Oct 11 19:18:05 2010 +0200 +++ b/docs/setup.rst Tue Oct 12 22:25:25 2010 +0200 @@ -26,7 +26,7 @@ - Remember that the given path for mercurial_ repositories must be write accessible for the application. It's very important since RhodeCode web interface will work even without such an access but, when trying to do a push it'll - eventually faile with permission denied errors. + eventually fail with permission denied errors. - Run :: @@ -35,15 +35,12 @@ - This command runs the rhodecode server the app should be available at the 127.0.0.1:5000. This ip and port is configurable via the production.ini - file created in previos step + file created in previous step - Use admin account you created to login. - Default permissions on each repository is read, and owner is admin. So - remember to update these. - -- All needed configs are inside rhodecode sources ie. celeryconfig.py, - development.ini, production.ini You can configure the email, ports, loggers, - workers from there. + remember to update these if needed. + Setting up Whoosh ----------------- @@ -51,7 +48,7 @@ :: - python /var/www/rhodecode/rhodecode/lib/indexers/daemon.py incremental <put_here_path_to_repos> + python /var/www/rhodecode/<rhodecode_installation_path>/lib/indexers/daemon.py incremental <put_here_path_to_repos> When using incremental mode whoosh will check last modification date of each file and add it to reindex if newer file is available. Also indexing daemon checks @@ -69,7 +66,7 @@ listen 80; server_name hg.myserver.com; access_log /var/log/nginx/rhodecode.access.log; - error_log /var/log/nginx/rhodecode.error.log; + error_log /var/log/nginx/rhodecode.error.log; location / { root /var/www/rhodecode/rhodecode/public/; if (!-f $request_filename){ @@ -81,7 +78,7 @@ } } -Here's the proxy.conf. It's tunned so it'll not timeout on long +Here's the proxy.conf. It's tuned so it'll not timeout on long pushes and also on large pushes:: proxy_redirect off; @@ -111,7 +108,7 @@ lang=en cache_dir = %(here)s/data -To not have the statics served by the application. +To not have the statics served by the application. And improve speed. Other configuration files
--- a/production.ini Mon Oct 11 19:18:05 2010 +0200 +++ b/production.ini Tue Oct 12 22:25:25 2010 +0200 @@ -47,21 +47,32 @@ #################################### ### BEAKER CACHE #### #################################### -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 -beaker.cache.long_term.type=memory -beaker.cache.long_term.expire=36000 -beaker.cache.short_term.type=memory -beaker.cache.short_term.expire=60 -beaker.cache.super_short_term.type=memory -beaker.cache.super_short_term.expire=10 + 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.long_term.type=memory + beaker.cache.long_term.expire=36000 + + beaker.cache.short_term.type=memory + beaker.cache.short_term.expire=60 + + beaker.cache.super_short_term.type=memory + beaker.cache.super_short_term.expire=10 + + beaker.cache.sql_cache_short.type=memory + beaker.cache.sql_cache_short.expire=5 + + beaker.cache.sql_cache_med.type=memory + beaker.cache.sql_cache_med.expire=360 + + beaker.cache.sql_cache_long.type=file + beaker.cache.sql_cache_long.expire=3600 #################################### ### BEAKER SESSION #### #################################### ## Type of storage used for the session, current types are -## dbm, file, memcached, database, and memory. +## "dbm", "file", "memcached", "database", and "memory". ## The storage uses the Container API ##that is also used by the cache system. beaker.session.type = file
--- a/rhodecode/__init__.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/__init__.py Tue Oct 12 22:25:25 2010 +0200 @@ -24,7 +24,7 @@ @author: marcink """ -VERSION = (1, 0, 0, 'rc3') +VERSION = (1, 0, 0, 'rc4') __version__ = '.'.join((str(each) for each in VERSION[:4]))
--- a/rhodecode/config/deployment.ini_tmpl Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/config/deployment.ini_tmpl Tue Oct 12 22:25:25 2010 +0200 @@ -48,21 +48,32 @@ #################################### ### BEAKER CACHE #### #################################### -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 -beaker.cache.long_term.type=memory -beaker.cache.long_term.expire=36000 -beaker.cache.short_term.type=memory -beaker.cache.short_term.expire=60 -beaker.cache.super_short_term.type=memory -beaker.cache.super_short_term.expire=10 + 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.long_term.type=memory + beaker.cache.long_term.expire=36000 + + beaker.cache.short_term.type=memory + beaker.cache.short_term.expire=60 + + beaker.cache.super_short_term.type=memory + beaker.cache.super_short_term.expire=10 + + beaker.cache.sql_cache_short.type=memory + beaker.cache.sql_cache_short.expire=5 + + beaker.cache.sql_cache_med.type=memory + beaker.cache.sql_cache_med.expire=360 + + beaker.cache.sql_cache_long.type=file + beaker.cache.sql_cache_long.expire=3600 #################################### ### BEAKER SESSION #### #################################### ## Type of storage used for the session, current types are -## dbm, file, memcached, database, and memory. +## "dbm", "file", "memcached", "database", and "memory". ## The storage uses the Container API ##that is also used by the cache system. beaker.session.type = file
--- a/rhodecode/controllers/changelog.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/controllers/changelog.py Tue Oct 12 22:25:25 2010 +0200 @@ -22,7 +22,7 @@ changelog controller for pylons @author: marcink """ -from json import dumps + from mercurial.graphmod import colored, CHANGESET, revisions as graph_rev from pylons import request, session, tmpl_context as c from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator @@ -32,6 +32,12 @@ import logging log = logging.getLogger(__name__) +try: + import json +except ImportError: + #python 2.5 compatibility + import simplejson as json + class ChangelogController(BaseController): @LoginRequired() @@ -69,7 +75,7 @@ def _graph(self, repo, size, p): revcount = size - if not repo.revisions:return dumps([]), 0 + if not repo.revisions:return json.dumps([]), 0 max_rev = repo.revisions[-1] offset = 1 if p == 1 else ((p - 1) * revcount + 1) @@ -86,5 +92,5 @@ continue data.append(('', vtx, edges)) - c.jsdata = dumps(data) + c.jsdata = json.dumps(data)
--- a/rhodecode/controllers/summary.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/controllers/summary.py Tue Oct 12 22:25:25 2010 +0200 @@ -35,7 +35,11 @@ from time import mktime import calendar import logging -import json +try: + import json +except ImportError: + #python 2.5 compatibility + import simplejson as json log = logging.getLogger(__name__) class SummaryController(BaseController):
--- a/rhodecode/model/meta.py Mon Oct 11 19:18:05 2010 +0200 +++ b/rhodecode/model/meta.py Tue Oct 12 22:25:25 2010 +0200 @@ -3,9 +3,6 @@ from sqlalchemy.orm import scoped_session, sessionmaker from rhodecode.model import caching_query from beaker import cache -import os -from os.path import join as jn, dirname as dn, abspath -import time # Beaker CacheManager. A home base for cache configurations. cache_manager = cache.CacheManager() @@ -25,39 +22,5 @@ #For another db... #Base2 = declarative_base() -#=============================================================================== -# CACHE OPTIONS -#=============================================================================== -cache_base = jn(dn(dn(dn(abspath(__file__)))), 'data') -cache_dir = jn(cache_base, 'cache') - -if not os.path.isdir(cache_base): - os.mkdir(cache_base) - -if not os.path.isdir(cache_dir): - os.mkdir(cache_dir) -# set start_time to current time -# to re-cache everything -# upon application startup -start_time = time.time() -# configure the "sqlalchemy" cache region. -cache_manager.regions['sql_cache_short'] = { - 'type':'memory', - 'data_dir':cache_dir, - 'expire':10, - 'start_time':start_time - } -cache_manager.regions['sql_cache_med'] = { - 'type':'memory', - 'data_dir':cache_dir, - 'expire':360, - 'start_time':start_time - } -cache_manager.regions['sql_cache_long'] = { - 'type':'file', - 'data_dir':cache_dir, - 'expire':3600, - 'start_time':start_time - } #to use cache use this in query #.options(FromCache("sqlalchemy_cache_type", "cachekey"))
--- a/setup.cfg Mon Oct 11 19:18:05 2010 +0200 +++ b/setup.cfg Tue Oct 12 22:25:25 2010 +0200 @@ -1,5 +1,5 @@ [egg_info] -tag_build = rc3 +tag_build = rc4 tag_svn_revision = true [easy_install] @@ -32,3 +32,11 @@ input_file = rhodecode/i18n/rhodecode.pot output_dir = rhodecode/i18n previous = true + +[build_sphinx] +source-dir = docs/ +build-dir = docs/_build +all_files = 1 + +[upload_sphinx] +upload-dir = docs/_build/html \ No newline at end of file