aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-09-05 23:28:41 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-09-05 23:28:41 -0500
commit273227e3999d43efe81f1e19f6d40c582c5cec86 (patch)
tree8328ed7ec8c87a691eebf76a66a5bc379d8892b7 /mediagoblin/init
parent9a64272e483ef1e3a5ee8b10555822a3ea158053 (diff)
parentfc21a55c76e9786f8ea8fdf504861c48e179a841 (diff)
downloadmediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.tar.lz
mediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.tar.xz
mediagoblin-273227e3999d43efe81f1e19f6d40c582c5cec86.zip
Merge branch 'i507_beaker_cache'
Diffstat (limited to 'mediagoblin/init')
-rw-r--r--mediagoblin/init/__init__.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 81d3a430..b7f52595 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -14,7 +14,10 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from beaker.cache import CacheManager
+from beaker.util import parse_cache_config_options
import jinja2
+
from mediagoblin import staticdirect
from mediagoblin.init.config import (
read_mediagoblin_config, generate_validation_report)
@@ -135,3 +138,16 @@ def setup_workbench():
workbench_manager = WorkbenchManager(app_config['workbench_path'])
setup_globals(workbench_manager = workbench_manager)
+
+
+def setup_beaker_cache():
+ """
+ Setup the Beaker Cache manager.
+ """
+ cache_config = mg_globals.global_config['beaker.cache']
+ cache_config = dict(
+ [(u'cache.%s' % key, value)
+ for key, value in cache_config.iteritems()])
+ cache = CacheManager(**parse_cache_config_options(cache_config))
+ setup_globals(cache=cache)
+ return cache