diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-05 23:28:41 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-05 23:28:41 -0500 |
| commit | 273227e3999d43efe81f1e19f6d40c582c5cec86 (patch) | |
| tree | 8328ed7ec8c87a691eebf76a66a5bc379d8892b7 /mediagoblin/app.py | |
| parent | 9a64272e483ef1e3a5ee8b10555822a3ea158053 (diff) | |
| parent | fc21a55c76e9786f8ea8fdf504861c48e179a841 (diff) | |
| download | mediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.tar.lz mediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.tar.xz mediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.zip | |
Merge branch 'i507_beaker_cache'
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 45b5e3ce..dd5f0b89 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -25,7 +25,7 @@ from mediagoblin.mg_globals import setup_globals from mediagoblin.init.celery import setup_celery_from_config from mediagoblin.init import (get_jinja_loader, get_staticdirector, setup_global_and_app_config, setup_workbench, setup_database, - setup_storage) + setup_storage, setup_beaker_cache) class MediaGoblinApp(object): @@ -71,6 +71,9 @@ class MediaGoblinApp(object): # set up staticdirector tool self.staticdirector = get_staticdirector(app_config) + # set up caching + self.cache = setup_beaker_cache() + # Setup celery, if appropriate if setup_celery and not app_config.get('celery_setup_elsewhere'): if os.environ.get('CELERY_ALWAYS_EAGER'): |