From 22081dd96a2223cbc7400f642ad20a27a22bf068 Mon Sep 17 00:00:00 2001 From: Brian Simpson Date: Mon, 23 Nov 2015 14:23:45 -0800 Subject: [PATCH] Move rendercache behind mcrouter. --- r2/r2/lib/app_globals.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 20f1e0995..44c7825cb 100644 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -256,7 +256,6 @@ class Globals(object): 'memcaches', 'lockcaches', 'permacache_memcaches', - 'rendercaches', 'pagecaches', 'memoizecaches', 'srmembercaches', @@ -751,17 +750,6 @@ class Globals(object): else: stalecaches = None - # rendercache holds rendered partial templates. - rendercaches = CMemcache( - "render", - self.rendercaches, - noreply=True, - no_block=True, - num_clients=num_mc_clients, - min_compress_len=480, - validators=[], - ) - # pagecaches hold fully rendered pages pagecaches = CMemcache( "page", @@ -884,9 +872,10 @@ class Globals(object): (localcache_cls(), ratelimitcaches)) cache_chains.update(ratelimitcache=self.ratelimitcache) + # rendercache holds rendered partial templates. self.rendercache = MemcacheChain(( localcache_cls(), - rendercaches, + self.mcrouter, )) cache_chains.update(rendercache=self.rendercache)